X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FMLDB.java;h=6521dedca06665da587e88ab6b9887e23ca28109;hb=87a1e58f79757bb0257c911e9bd77eb5d77a3e40;hp=832d57d759da8ea2b6457170ceec7392d9682fc1;hpb=9579cf8c416181bc54107a3577a0da8bd62516df;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 832d57d7..6521dedc 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,37 +17,16 @@ 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; -import android.database.MatrixCursor; -import android.database.SQLException; import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteOpenHelper; -import android.os.AsyncTask; -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 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; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.util.Locale; - import static net.ktnx.mobileledger.utils.Logger.debug; public final class MLDB { @@ -55,35 +34,8 @@ 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"; - private static final String NO_PROFILE = "-"; - private static MobileLedgerDatabase dbHelper; - private static Application context; - private static void checkState() { - if (context == null) - throw new IllegalStateException("First call init with a valid context"); - } - public static SQLiteDatabase getDatabase() { - checkState(); - - SQLiteDatabase db; - - db = dbHelper.getWritableDatabase(); - - db.execSQL("pragma case_sensitive_like=ON;"); - return db; - } - @SuppressWarnings("unused") - static public int getIntOption(String name, int default_value) { - String s = getOption(name, String.valueOf(default_value)); - try { - return Integer.parseInt(s); - } - catch (Exception e) { - debug("db", "returning default int value of " + name, e); - return default_value; - } - } + public static final String OPT_PROFILE_ID = "profile_id"; + public static final long NO_PROFILE = 0; @SuppressWarnings("unused") static public long getLongOption(String name, long default_value) { String s = getOption(name, String.valueOf(default_value)); @@ -95,53 +47,23 @@ public final class MLDB { return default_value; } } - static public void getOption(String name, String defaultValue, GetOptCallback cb) { - AsyncTask t = new AsyncTask() { - @Override - protected String doInBackground(Void... params) { - SQLiteDatabase db = getDatabase(); - 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; - - debug("async-db", "option " + name + "=" + result); - return result; - } - else return defaultValue; - } - catch (Exception e) { - debug("db", "returning default value for " + name, e); - return defaultValue; - } - } - @Override - protected void onPostExecute(String result) { - cb.onResult(result); - } - }; - - t.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null); - } static public String getOption(String name, String default_value) { debug("db", "about to fetch option " + name); - SQLiteDatabase db = getDatabase(); - try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?", - new String[]{NO_PROFILE, name})) + SQLiteDatabase db = App.getDatabase(); + try (Cursor cursor = db.rawQuery("select value from options where profile_id=? and name=?", + new String[]{String.valueOf(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); @@ -150,179 +72,53 @@ public final class MLDB { } static public void setOption(String name, String value) { debug("option", String.format("%s := %s", name, value)); - DbOpQueue.add("insert or replace into options(profile, name, value) values(?, ?, ?);", - new String[]{NO_PROFILE, name, value}); + DbOpQueue.add("insert or replace into options(profile_id, name, value) values(?, ?, ?);", + new String[]{String.valueOf(NO_PROFILE), name, value}); } @SuppressWarnings("unused") 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, - final boolean profileSpecific) { - hookAutocompletionAdapter(context, view, table, field, profileSpecific, null, null, - Data.profile.getValue()); - } - @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 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[] 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}; + 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(); + + 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 %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}; + catch (Exception e) { + callbackHelper.onException(e); } - debug("autocompletion", sql); - SQLiteDatabase db = MLDB.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); - } + finally { + callbackHelper.onDone(); } - - return c; - - }; - - 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())); - } - }); - } - } - public static synchronized void init(Application context) { - MLDB.context = context; - if (dbHelper != null) - throw new IllegalStateException("It appears init() was already called"); - dbHelper = new MobileLedgerDatabase(context); - } - public static synchronized void done() { - if (dbHelper != null) { - debug("db", "Closing DB helper"); - dbHelper.close(); - dbHelper = null; + }); + + 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() {} } } -class MobileLedgerDatabase extends SQLiteOpenHelper { - private static final String DB_NAME = "MoLe.db"; - private static final int LATEST_REVISION = 22; - private static final String CREATE_DB_SQL = "create_db"; - - private final Application mContext; - - MobileLedgerDatabase(Application context) { - super(context, DB_NAME, null, LATEST_REVISION); - debug("db", "creating helper instance"); - mContext = context; - super.setWriteAheadLoggingEnabled(true); - } - - @Override - public void onCreate(SQLiteDatabase db) { - debug("db", "onCreate called"); - applyRevisionFile(db, CREATE_DB_SQL); - } - - @Override - public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - debug("db", "onUpgrade called"); - for (int i = oldVersion + 1; i <= newVersion; i++) applyRevision(db, i); - } - - private void applyRevision(SQLiteDatabase db, int rev_no) { - String rev_file = String.format(Locale.US, "sql_%d", rev_no); - - applyRevisionFile(db, rev_file); - } - private void applyRevisionFile(SQLiteDatabase db, String rev_file) { - final Resources rm = mContext.getResources(); - int res_id = rm.getIdentifier(rev_file, "raw", mContext.getPackageName()); - if (res_id == 0) - throw new SQLException(String.format(Locale.US, "No resource for %s", rev_file)); - db.beginTransaction(); - try (InputStream res = rm.openRawResource(res_id)) { - debug("db", "Applying " + rev_file); - InputStreamReader isr = new InputStreamReader(res); - BufferedReader reader = new BufferedReader(isr); - - String line; - int line_no = 1; - while ((line = reader.readLine()) != null) { - 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 %s, line %d", rev_file, line_no), e); - } - line_no++; - } - - db.setTransactionSuccessful(); - } - catch (IOException e) { - Log.e("db", String.format("Error opening raw resource for %s", rev_file)); - e.printStackTrace(); - } - finally { - db.endTransaction(); - } - } -}