X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FMLDB.java;h=2a9dca89a626ac78a504597194b0e8de3ec80b60;hb=93545c6fbf1244fbd96ecfc50e1115dbdc25f9ae;hp=03b207c8f02c017e1643e131e1a8ac6b3acde32e;hpb=4279b12443f6106017e9f33a5c9e21caf67ec64d;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 03b207c8..2a9dca89 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 © 2019 Damyan Ivanov.
+ * Copyright © 2021 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -17,23 +17,14 @@
 
 package net.ktnx.mobileledger.utils;
 
-import android.annotation.TargetApi;
-import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.AsyncTask;
-import android.os.Build;
-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;
-import net.ktnx.mobileledger.model.Data;
-import net.ktnx.mobileledger.model.MobileLedgerProfile;
 
 import org.jetbrains.annotations.NonNls;
 
@@ -44,7 +35,7 @@ public final class MLDB {
     public static final String DESCRIPTION_HISTORY_TABLE = "description_history";
     public static final String OPT_LAST_SCRAPE = "last_scrape";
     @NonNls
-    public static final String OPT_PROFILE_UUID = "profile_uuid";
+    public static final String OPT_PROFILE_ID = "profile_id";
     private static final String NO_PROFILE = "-";
     @SuppressWarnings("unused")
     static public int getIntOption(String name, int default_value) {
@@ -134,75 +125,8 @@ public final class MLDB {
     static public void setLongOption(String name, long value) {
         setOption(name, String.valueOf(value));
     }
-    @TargetApi(Build.VERSION_CODES.N)
-    public static void hookAutocompletionAdapter(final Context context,
-                                                 final AutoCompleteTextView view,
-                                                 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 DescriptionSelectedCallback callback,
-                                                 final MobileLedgerProfile profile) {
-        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 = constraint -> {
-            if (constraint == null)
-                return null;
-
-            String str = constraint.toString()
-                                   .toUpperCase();
-            debug("autocompletion", "Looking for " + str);
-
-            String sql;
-            String[] params;
-            if (profileSpecific) {
-                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 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();
-
-            return db.rawQuery(sql, params);
-        };
-
-        adapter.setFilterQueryProvider(provider);
-
-        view.setAdapter(adapter);
-
-        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) {
+    public static void queryInBackground(@NonNull String statement, String[] params,
+                                         @NonNull final CallbackHelper callbackHelper) {
         /* All callbacks are called in the new (asynchronous) thread! */
         Thread t = new Thread(() -> {
             callbackHelper.onStart();