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=07aea52b34b91a2e425ffda643c77d2a94f57e5f;hpb=64d69a2f7f729949b9236489ab7c4ce9f9aaea86;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 07aea52b..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) { @@ -73,19 +64,21 @@ public final class MLDB { @Override protected String doInBackground(Void... params) { SQLiteDatabase db = App.getDatabase(); - try (Cursor cursor = db - .rawQuery("select value from options where profile = ? and name=?", - new String[]{NO_PROFILE, name})) + 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 = defaultValue; + if (result == null) + result = defaultValue; debug("async-db", "option " + name + "=" + result); return result; } - else return defaultValue; + else + return defaultValue; } catch (Exception e) { debug("db", "returning default value for " + name, e); @@ -103,18 +96,20 @@ public final class MLDB { static public String getOption(String name, String default_value) { debug("db", "about to fetch option " + name); SQLiteDatabase db = App.getDatabase(); - try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?", + 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; debug("db", "option " + name + "=" + result); return result; } - else return default_value; + else + return default_value; } catch (Exception e) { debug("db", "returning default value for " + name, e); @@ -130,68 +125,46 @@ 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); + 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(); + try { + SQLiteDatabase db = App.getDatabase(); - 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}; + try (Cursor cursor = db.rawQuery(statement, params)) { + boolean gotRow = false; + while (cursor.moveToNext()) { + gotRow = true; + if (!callbackHelper.onRow(cursor)) + break; + } + if (!gotRow) { + callbackHelper.onNoRows(); + } + } } - 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}; + catch (Exception e) { + callbackHelper.onException(e); + } + finally { + callbackHelper.onDone(); } - 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())); }); + + 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() {} } }