X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FMLDB.java;h=6aaa62c6df099cf28fa4c65d971182dac926acc7;hb=4097e258df29d671bb72f89483489388dd5f4aa8;hp=e769be4e8de61ae08491e5e69d42ee7c60a7495f;hpb=90383a155ec16a9f13b1e6ac94a118033e09b3aa;p=mobile-ledger.git

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 e769be4e..6aaa62c6 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
@@ -20,16 +20,15 @@ package net.ktnx.mobileledger.utils;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.database.Cursor;
-import android.database.MatrixCursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.AsyncTask;
 import android.os.Build;
-import android.provider.FontsContract;
-import android.view.View;
 import android.widget.AutoCompleteTextView;
 import android.widget.FilterQueryProvider;
 import android.widget.SimpleCursorAdapter;
 
+import androidx.annotation.NonNull;
+
 import net.ktnx.mobileledger.App;
 import net.ktnx.mobileledger.async.DbOpQueue;
 import net.ktnx.mobileledger.async.DescriptionSelectedCallback;
@@ -38,8 +37,6 @@ import net.ktnx.mobileledger.model.MobileLedgerProfile;
 
 import org.jetbrains.annotations.NonNls;
 
-import java.util.Locale;
-
 import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public final class MLDB {
@@ -136,16 +133,14 @@ public final class MLDB {
     @TargetApi(Build.VERSION_CODES.N)
     public static void hookAutocompletionAdapter(final Context context,
                                                  final AutoCompleteTextView view,
-                                                 final String table, final String field,
-                                                 final boolean profileSpecific) {
-        hookAutocompletionAdapter(context, view, table, field, profileSpecific, null, null,
-                Data.profile.getValue());
+                                                 final String table, final String field) {
+        hookAutocompletionAdapter(context, view, table, field, true, null, null);
     }
     @TargetApi(Build.VERSION_CODES.N)
     public static void hookAutocompletionAdapter(final Context context,
                                                  final AutoCompleteTextView view,
                                                  final String table, final String field,
-                                                 final boolean profileSpecific, final View nextView,
+                                                 final boolean profileSpecific,
                                                  final DescriptionSelectedCallback callback,
                                                  final MobileLedgerProfile profile) {
         String[] from = {field};
@@ -160,58 +155,83 @@ public final class MLDB {
 
             String str = constraint.toString().toUpperCase();
             debug("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, profile.getUuid(), str};
+                MobileLedgerProfile p = (profile == null) ? Data.profile.getValue() : profile;
+                if (p == null) throw new AssertionError();
+                sql = String.format(
+                        "SELECT rowid as _id, %s, 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 3, %s_upper, 1;", field, field, field, field, table, field,
+                        field);
+                params = new String[]{str, str, str, p.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);
+                sql = String.format(
+                        "SELECT rowid as _id, %s, 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 3, %s_upper, 1;", field,
+                        field, field, field, table, field, field);
                 params = new String[]{str, str, str, str};
             }
             debug("autocompletion", sql);
             SQLiteDatabase db = App.getDatabase();
 
-            try (Cursor matches = db.rawQuery(sql, params)) {
-                int i = 0;
-                while (matches.moveToNext()) {
-                    String match = matches.getString(0);
-                    int order = matches.getInt(1);
-                    debug("autocompletion",
-                            String.format(Locale.ENGLISH, "match: %s |%d", match, order));
-                    c.newRow().add(i++).add(match);
-                }
-            }
-
-            return c;
-
+            return db.rawQuery(sql, params);
         };
 
         adapter.setFilterQueryProvider(provider);
 
         view.setAdapter(adapter);
 
-        if (nextView != null) {
-            view.setOnItemClickListener((parent, itemView, position, id) -> {
-                nextView.requestFocus(View.FOCUS_FORWARD);
-                if (callback != null) {
-                    callback.descriptionSelected(String.valueOf(view.getText()));
+        if (callback != null) view.setOnItemClickListener((parent, itemView, position, id) -> {
+            callback.descriptionSelected(String.valueOf(view.getText()));
+    }
+    public static void queryInBackground(@NonNull String statement, @NonNull String[] params,
+                                         @NonNull CallbackHelper callbackHelper) {
+        /* All callbacks are called in the new (asynchronous) thread! */
+        Thread t = new Thread(() -> {
+            callbackHelper.onStart();
+            try {
+                SQLiteDatabase db = App.getDatabase();
+
+                try (Cursor cursor = db.rawQuery(statement, params)) {
+                    boolean gotRow = false;
+                    while (cursor.moveToNext()) {
+                        gotRow = true;
+                        if (!callbackHelper.onRow(cursor))
+                            break;
+                    }
+                    if (!gotRow) {
+                        callbackHelper.onNoRows();
+                    }
                 }
-            });
+            }
+            catch (Exception e) {
+                callbackHelper.onException(e);
+            }
+            finally {
+                callbackHelper.onDone();
+            }
+        });
+
+        t.start();
+    }
+    /* MLDB.CallbackHelper -- Abstract class for asynchronous SQL query callbacks */
+    @SuppressWarnings("WeakerAccess")
+    abstract public static class CallbackHelper {
+        public void onStart() {}
+        public abstract boolean onRow(@NonNull Cursor cursor);
+        public void onNoRows() {}
+        public void onException(Exception exception) {
+            Logger.debug("MLDB", "Exception in asynchronous SQL", exception);
         }
+        public void onDone() {}
     }
 }