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=c11ea8486182839e89c3667ee23d5acc82e1aea8;hpb=b011feba6b09f35a0e07c9502f126877b5f05905;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 c11ea848..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,233 +1,170 @@
/*
- * Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * 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
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.utils;
-import android.annotation.TargetApi;
-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.Build;
-import android.provider.FontsContract;
-import android.util.Log;
-import android.widget.AutoCompleteTextView;
-import android.widget.FilterQueryProvider;
-import android.widget.SimpleCursorAdapter;
+import android.os.AsyncTask;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.Locale;
+import androidx.annotation.NonNull;
-import static net.ktnx.mobileledger.utils.MLDB.DatabaseMode.READ;
-import static net.ktnx.mobileledger.utils.MLDB.DatabaseMode.WRITE;
+import net.ktnx.mobileledger.App;
+import net.ktnx.mobileledger.async.DbOpQueue;
+
+import org.jetbrains.annotations.NonNls;
+
+import static net.ktnx.mobileledger.utils.Logger.debug;
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";
- private static MobileLedgerDatabase helperForReading, helperForWriting;
- private static Context context;
- private static void checkState() {
- if (context == null)
- throw new IllegalStateException("First call init with a valid context");
- }
- public static synchronized SQLiteDatabase getDatabase(DatabaseMode mode) {
- checkState();
-
- if (mode == READ) {
- if (helperForReading == null) helperForReading = new MobileLedgerDatabase(context);
- return helperForReading.getReadableDatabase();
- }
- else {
- if (helperForWriting == null) helperForWriting = new MobileLedgerDatabase(context);
- return helperForWriting.getWritableDatabase();
- }
- }
- public static SQLiteDatabase getReadableDatabase() {
- return getDatabase(READ);
- }
- public static SQLiteDatabase getWritableDatabase() {
- return getDatabase(WRITE);
- }
- static public int get_option_value(String name, int default_value) {
- String s = get_option_value(name, String.valueOf(default_value));
+ public static final String OPT_LAST_SCRAPE = "last_scrape";
+ @NonNls
+ 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) {
+ String s = getOption(name, String.valueOf(default_value));
try {
return Integer.parseInt(s);
}
catch (Exception e) {
- Log.d("db", "returning default int value of " + name, e);
+ debug("db", "returning default int value of " + name, e);
return default_value;
}
}
- static public long get_option_value(String name, long default_value) {
- String s = get_option_value(name, String.valueOf(default_value));
+ @SuppressWarnings("unused")
+ static public long getLongOption(String name, long default_value) {
+ String s = getOption(name, String.valueOf(default_value));
try {
return Long.parseLong(s);
}
catch (Exception e) {
- Log.d("db", "returning default long value of " + name, e);
+ debug("db", "returning default long value of " + name, e);
return default_value;
}
}
- 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);
-
- 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;
- }
- }
- }
- 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});
- }
- }
- static public void set_option_value(String name, long value) {
- set_option_value(name, String.valueOf(value));
- }
- @TargetApi(Build.VERSION_CODES.N)
- public static void hook_autocompletion_adapter(final Context context,
- final AutoCompleteTextView view,
- final String table, final String field) {
- 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 = new FilterQueryProvider() {
+ static public void getOption(String name, String defaultValue, GetOptCallback cb) {
+ AsyncTask t = new AsyncTask() {
@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);
- }
+ 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}))
+ {
+ if (cursor.moveToFirst()) {
+ String result = cursor.getString(0);
+
+ if (result == null)
+ result = defaultValue;
+
+ debug("async-db", "option " + name + "=" + result);
+ return result;
}
-
- return c;
+ 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);
}
};
- adapter.setFilterQueryProvider(provider);
-
- view.setAdapter(adapter);
+ t.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, (Void) null);
}
- public static void init(Context context) {
- MLDB.context = context.getApplicationContext();
- }
- 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;
-
- private final Context mContext;
-
- public MobileLedgerDatabase(Context context) {
- super(context, DB_NAME, null, LATEST_REVISION);
- Log.d("db", "creating helper instance");
- mContext = context;
- super.setWriteAheadLoggingEnabled(true);
+ 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=?",
+ new String[]{NO_PROFILE, name}))
+ {
+ if (cursor.moveToFirst()) {
+ String result = cursor.getString(0);
+
+ if (result == null)
+ result = default_value;
+
+ debug("db", "option " + name + "=" + result);
+ return result;
+ }
+ else
+ return default_value;
+ }
+ catch (Exception e) {
+ debug("db", "returning default value for " + name, e);
+ return default_value;
+ }
}
-
- @Override
- public void onCreate(SQLiteDatabase db) {
- Log.d("db", "onCreate called");
- onUpgrade(db, -1, LATEST_REVISION);
+ 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});
}
-
- @Override
- public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
- Log.d("db", "onUpgrade called");
- for (int i = oldVersion + 1; i <= newVersion; i++) applyRevision(db, i);
+ @SuppressWarnings("unused")
+ static public void setLongOption(String name, long value) {
+ setOption(name, String.valueOf(value));
}
-
- private void applyRevision(SQLiteDatabase db, int rev_no) {
- final Resources rm = mContext.getResources();
- String rev_file = String.format(Locale.US, "sql_%d", rev_no);
-
- int res_id = rm.getIdentifier(rev_file, "raw", mContext.getPackageName());
- if (res_id == 0)
- throw new SQLException(String.format(Locale.US, "No resource for revision %d", rev_no));
- db.beginTransaction();
- try (InputStream res = rm.openRawResource(res_id)) {
- Log.d("db", "Applying revision " + String.valueOf(rev_no));
- InputStreamReader isr = new InputStreamReader(res);
- BufferedReader reader = new BufferedReader(isr);
-
- String line;
- while ((line = reader.readLine()) != null) {
- db.execSQL(line);
+ 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();
+ }
+ }
}
+ catch (Exception e) {
+ callbackHelper.onException(e);
+ }
+ finally {
+ callbackHelper.onDone();
+ }
+ });
- db.setTransactionSuccessful();
- }
- catch (IOException e) {
- Log.e("db", String.format("Error opening raw resource for revision %d", rev_no));
- e.printStackTrace();
- }
- finally {
- db.endTransaction();
+ 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() {}
}
}
+