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=47a5e965e89678aaef0e6cb716d2ae8512bb70f1;hp=b42f1613f5704dfb52bf24ba08ad606873180683;hb=ee7f9769f1f6a6e02fed8c4d7b68c8f4ac5c4ea2;hpb=74c3711f3a71f54979d7a687e9ac20b903e38ea2 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 b42f1613..47a5e965 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 @@ -18,6 +18,7 @@ package net.ktnx.mobileledger.utils; import android.annotation.TargetApi; +import android.app.Application; import android.content.Context; import android.content.res.Resources; import android.database.Cursor; @@ -45,8 +46,9 @@ public final class MLDB { 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"; + public static final String OPT_LAST_REFRESH = "last_refresh"; private static MobileLedgerDatabase helperForReading, helperForWriting; - private static Context context; + private static Application context; private static void checkState() { if (context == null) throw new IllegalStateException("First call init with a valid context"); @@ -66,11 +68,11 @@ public final class MLDB { public static SQLiteDatabase getReadableDatabase() { return getDatabase(READ); } - public static SQLiteDatabase getWritableDatabase(Context context) { + 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); } @@ -79,8 +81,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); } @@ -89,37 +91,35 @@ 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()) { - try (Cursor cursor = db - .rawQuery("select value from options where name=?", new String[]{name})) - { - if (cursor.moveToFirst()) { - String result = cursor.getString(0); + SQLiteDatabase db = getReadableDatabase(); + try (Cursor cursor = db + .rawQuery("select value from options where name=?", new String[]{name})) + { + if (cursor.moveToFirst()) { + String result = cursor.getString(0); - if (result == null) result = default_value; + if (result == null) result = default_value; - Log.d("db", "option " + name + "=" + result); - return result; - } - else return default_value; - } - catch (Exception e) { - Log.d("db", "returning default value for " + name, e); - return default_value; + Log.d("db", "option " + name + "=" + result); + return result; } + else return default_value; + } + catch (Exception e) { + Log.d("db", "returning default value for " + name, e); + return default_value; } } - 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)) { - db.execSQL("insert or replace into options(name, value) values(?, ?);", - new String[]{name, value}); - } + SQLiteDatabase db = getWritableDatabase(); + db.execSQL("insert or replace into options(name, value) values(?, ?);", + new String[]{name, value}); } - static public void set_option_value(Context context, String name, long value) { - set_option_value(context, name, String.valueOf(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, @@ -142,28 +142,26 @@ public final class MLDB { 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); - } + 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; } + return c; + } }; @@ -171,15 +169,22 @@ public final class MLDB { view.setAdapter(adapter); } - public static void init(Context context) { - MLDB.context = context.getApplicationContext(); + public static void init(Application context) { + MLDB.context = context; + } + public static void done() { + if (helperForReading != null) + helperForReading.close(); + + if ((helperForWriting != helperForReading) && (helperForWriting != null)) + helperForWriting.close(); } 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 = 10; + public static final int LATEST_REVISION = 11; private final Context mContext;