]> git.ktnx.net Git - mobile-ledger.git/blobdiff - app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
new transaction: advance to next field upon autocompletion of account name or description
[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / utils / MLDB.java
index 443e0a9a5bdc2eedffeb3e55472d798c2be8065d..b35579361ea84fed32384b8256f88c5024b28c6b 100644 (file)
@@ -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;
@@ -28,10 +29,15 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.os.Build;
 import android.provider.FontsContract;
 import android.util.Log;
+import android.view.View;
 import android.widget.AutoCompleteTextView;
 import android.widget.FilterQueryProvider;
 import android.widget.SimpleCursorAdapter;
 
+import net.ktnx.mobileledger.model.Data;
+
+import org.jetbrains.annotations.NonNls;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -44,10 +50,12 @@ import static net.ktnx.mobileledger.utils.MLDB.DatabaseMode.WRITE;
 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";
+    public static final String OPT_LAST_SCRAPE = "last_scrape";
+    @NonNls
+    public static final String OPT_PROFILE_UUID = "profile_uuid";
+    private static final String NO_PROFILE = "-";
     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");
@@ -92,32 +100,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 profile = ? and name=?",
+                new String[]{NO_PROFILE, 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});
-        }
+        Log.d("option", String.format("%s := %s", name, value));
+        SQLiteDatabase db = MLDB.getWritableDatabase();
+        db.execSQL("insert or replace into options(profile, name, value) values(?, ?, ?);",
+                new String[]{NO_PROFILE, name, value});
     }
     static public void set_option_value(String name, long value) {
         set_option_value(name, String.valueOf(value));
@@ -125,7 +131,15 @@ public final class MLDB {
     @TargetApi(Build.VERSION_CODES.N)
     public static void hook_autocompletion_adapter(final Context context,
                                                    final AutoCompleteTextView view,
-                                                   final String table, final String field) {
+                                                   final String table, final String field,
+                                                   final boolean profileSpecific) {
+        hook_autocompletion_adapter(context, view, table, field, profileSpecific, null);
+    }
+    @TargetApi(Build.VERSION_CODES.N)
+    public static void hook_autocompletion_adapter(final Context context,
+                                                   final AutoCompleteTextView view, final String table, final String field,
+                                                   final boolean profileSpecific,
+                                                   final View nextView) {
         String[] from = {field};
         int[] to = {android.R.id.text1};
         SimpleCursorAdapter adapter =
@@ -133,58 +147,80 @@ public final class MLDB {
                         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;
-                }
+        FilterQueryProvider provider = 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);
+
+            String sql;
+            String[] params;
+            if (profileSpecific) {
+                sql = 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 profile=? AND %s_upper LIKE '%%'||?||'%%' " +
+                                    "ORDER BY 2, 1;", field, field, field, field, table, field);
+                params = new String[]{str, str, str, Data.profile.get().getUuid(), str};
+            }
+            else {
+                sql = 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);
+                params = new String[]{str, str, str, str};
+            }
+            Log.d("autocompletion", sql);
+            SQLiteDatabase db = MLDB.getReadableDatabase();
 
+            try (Cursor matches = db.rawQuery(sql, params)) {
+                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;
+
         };
 
         adapter.setFilterQueryProvider(provider);
 
         view.setAdapter(adapter);
+
+        if (nextView != null) {
+            view.setOnItemClickListener((parent, itemView, position, id) -> {
+                nextView.requestFocus(View.FOCUS_FORWARD);
+            });
+        }
     }
-    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 = 16;
 
-    private final Context mContext;
+    private final Application mContext;
 
-    public MobileLedgerDatabase(Context context) {
+    public MobileLedgerDatabase(Application context) {
         super(context, DB_NAME, null, LATEST_REVISION);
         Log.d("db", "creating helper instance");
         mContext = context;
@@ -217,8 +253,25 @@ class MobileLedgerDatabase extends SQLiteOpenHelper implements AutoCloseable {
             BufferedReader reader = new BufferedReader(isr);
 
             String line;
+            int line_no = 1;
             while ((line = reader.readLine()) != null) {
-                db.execSQL(line);
+                if (line.startsWith("--")) {
+                    line_no++;
+                    continue;
+                }
+                if (line.isEmpty()) {
+                    line_no++;
+                    continue;
+                }
+                try {
+                    db.execSQL(line);
+                }
+                catch (Exception e) {
+                    throw new RuntimeException(
+                            String.format("Error applying revision %d, line %d", rev_no, line_no),
+                            e);
+                }
+                line_no++;
             }
 
             db.setTransactionSuccessful();