bump latest revision to 11

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / utils / MLDB.java

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 c11ea8486182839e89c3667ee23d5acc82e1aea8..47a5e965e89678aaef0e6cb716d2ae8512bb70f1 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
@@ -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");
@@ -91,32 +93,30 @@ public final class MLDB {
     }
     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(String name, String value) {
         Log.d("db", "setting option " + name + "=" + value);
-        try (SQLiteDatabase db = getWritableDatabase()) {
-            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(String name, long value) {
         set_option_value(name, String.valueOf(value));
@@ -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;