X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FMLDB.java;h=c11ea8486182839e89c3667ee23d5acc82e1aea8;hp=9d8950a6c373c925bd89176b49c4abb8c6ca6b0e;hb=b011feba6b09f35a0e07c9502f126877b5f05905;hpb=9244cf0f5edae3491bd5d117f065f8a3d2831e72 diff --git a/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java b/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java index 9d8950a6..c11ea848 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java @@ -1,5 +1,5 @@ /* - * Copyright © 2018 Damyan Ivanov. + * Copyright © 2019 Damyan Ivanov. * This file is part of Mobile-Ledger. * Mobile-Ledger is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -17,13 +17,20 @@ package net.ktnx.mobileledger.utils; +import android.annotation.TargetApi; import android.content.Context; import android.content.res.Resources; import android.database.Cursor; +import android.database.MatrixCursor; import android.database.SQLException; import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; +import android.os.Build; +import android.provider.FontsContract; import android.util.Log; +import android.widget.AutoCompleteTextView; +import android.widget.FilterQueryProvider; +import android.widget.SimpleCursorAdapter; import java.io.BufferedReader; import java.io.IOException; @@ -35,13 +42,18 @@ import static net.ktnx.mobileledger.utils.MLDB.DatabaseMode.READ; import static net.ktnx.mobileledger.utils.MLDB.DatabaseMode.WRITE; public final class MLDB { - public enum DatabaseMode {READ, WRITE} - public static final String ACCOUNTS_TABLE = "accounts"; public static final String DESCRIPTION_HISTORY_TABLE = "description_history"; + public static final String OPT_TRANSACTION_LIST_STAMP = "transaction_list_last_update"; private static MobileLedgerDatabase helperForReading, helperForWriting; + private static Context context; + private static void checkState() { + if (context == null) + throw new IllegalStateException("First call init with a valid context"); + } + public static synchronized SQLiteDatabase getDatabase(DatabaseMode mode) { + checkState(); - public static synchronized SQLiteDatabase getDatabase(Context context, DatabaseMode mode) { if (mode == READ) { if (helperForReading == null) helperForReading = new MobileLedgerDatabase(context); return helperForReading.getReadableDatabase(); @@ -51,14 +63,14 @@ public final class MLDB { return helperForWriting.getWritableDatabase(); } } - public static SQLiteDatabase getReadableDatabase(Context context) { - return getDatabase(context, READ); + public static SQLiteDatabase getReadableDatabase() { + return getDatabase(READ); } - public static SQLiteDatabase getWritableDatabase(Context context) { - return getDatabase(context, WRITE); + public static SQLiteDatabase getWritableDatabase() { + return getDatabase(WRITE); } - static public int get_option_value(Context context, String name, int default_value) { - String s = get_option_value(context, name, String.valueOf(default_value)); + static public int get_option_value(String name, int default_value) { + String s = get_option_value(name, String.valueOf(default_value)); try { return Integer.parseInt(s); } @@ -67,9 +79,8 @@ public final class MLDB { return default_value; } } - - static public long get_option_value(Context context, String name, long default_value) { - String s = get_option_value(context, name, String.valueOf(default_value)); + static public long get_option_value(String name, long default_value) { + String s = get_option_value(name, String.valueOf(default_value)); try { return Long.parseLong(s); } @@ -78,10 +89,9 @@ public final class MLDB { return default_value; } } - - static public String get_option_value(Context context, String name, String default_value) { + static public String get_option_value(String name, String default_value) { Log.d("db", "about to fetch option " + name); - try (SQLiteDatabase db = getReadableDatabase(context)) { + try (SQLiteDatabase db = getReadableDatabase()) { try (Cursor cursor = db .rawQuery("select value from options where name=?", new String[]{name})) { @@ -101,23 +111,75 @@ public final class MLDB { } } } - - static public void set_option_value(Context context, String name, String value) { + static public void set_option_value(String name, String value) { Log.d("db", "setting option " + name + "=" + value); - try (SQLiteDatabase db = getWritableDatabase(context)) { + try (SQLiteDatabase db = getWritableDatabase()) { db.execSQL("insert or replace into options(name, value) values(?, ?);", new String[]{name, value}); } } + static public void set_option_value(String name, long value) { + set_option_value(name, String.valueOf(value)); + } + @TargetApi(Build.VERSION_CODES.N) + public static void hook_autocompletion_adapter(final Context context, + final AutoCompleteTextView view, + final String table, final String field) { + String[] from = {field}; + int[] to = {android.R.id.text1}; + SimpleCursorAdapter adapter = + new SimpleCursorAdapter(context, android.R.layout.simple_dropdown_item_1line, null, + from, to, 0); + adapter.setStringConversionColumn(1); + + FilterQueryProvider provider = new FilterQueryProvider() { + @Override + public Cursor runQuery(CharSequence constraint) { + if (constraint == null) return null; + + String str = constraint.toString().toUpperCase(); + Log.d("autocompletion", "Looking for " + str); + String[] col_names = {FontsContract.Columns._ID, field}; + MatrixCursor c = new MatrixCursor(col_names); + + try (SQLiteDatabase db = MLDB.getReadableDatabase()) { + + try (Cursor matches = db.rawQuery(String.format( + "SELECT %s as a, case when %s_upper LIKE ?||'%%' then 1 " + + "WHEN %s_upper LIKE '%%:'||?||'%%' then 2 " + + "WHEN %s_upper LIKE '%% '||?||'%%' then 3 " + "else 9 end " + + "FROM %s " + "WHERE %s_upper LIKE '%%'||?||'%%' " + "ORDER BY 2, 1;", + field, field, field, field, table, field), + new String[]{str, str, str, str})) + { + int i = 0; + while (matches.moveToNext()) { + String match = matches.getString(0); + int order = matches.getInt(1); + Log.d("autocompletion", String.format("match: %s |%d", match, order)); + c.newRow().add(i++).add(match); + } + } + + return c; + } + + } + }; - static public void set_option_value(Context context, String name, long value) { - set_option_value(context, name, String.valueOf(value)); + adapter.setFilterQueryProvider(provider); + + view.setAdapter(adapter); + } + public static void init(Context context) { + MLDB.context = context.getApplicationContext(); } + public enum DatabaseMode {READ, WRITE} } class MobileLedgerDatabase extends SQLiteOpenHelper implements AutoCloseable { public static final String DB_NAME = "mobile-ledger.db"; - public static final int LATEST_REVISION = 8; + public static final int LATEST_REVISION = 10; private final Context mContext; @@ -145,8 +207,8 @@ class MobileLedgerDatabase extends SQLiteOpenHelper implements AutoCloseable { String rev_file = String.format(Locale.US, "sql_%d", rev_no); int res_id = rm.getIdentifier(rev_file, "raw", mContext.getPackageName()); - if (res_id == 0) throw new SQLException( - String.format(Locale.US, "No resource for revision %d", rev_no)); + if (res_id == 0) + throw new SQLException(String.format(Locale.US, "No resource for revision %d", rev_no)); db.beginTransaction(); try (InputStream res = rm.openRawResource(res_id)) { Log.d("db", "Applying revision " + String.valueOf(rev_no));