X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FMLDB.java;h=6521dedca06665da587e88ab6b9887e23ca28109;hb=b033938cc547329fd4bab5b15304a099b10360e0;hp=9d8950a6c373c925bd89176b49c4abb8c6ca6b0e;hpb=9244cf0f5edae3491bd5d117f065f8a3d2831e72;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 9d8950a6..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,171 +1,124 @@
/*
- * Copyright © 2018 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.content.Context;
-import android.content.res.Resources;
import android.database.Cursor;
-import android.database.SQLException;
import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.util.Log;
-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;
-public final class MLDB {
- public enum DatabaseMode {READ, WRITE}
+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";
- private static MobileLedgerDatabase helperForReading, helperForWriting;
-
- public static synchronized SQLiteDatabase getDatabase(Context context, DatabaseMode mode) {
- 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(Context context) {
- return getDatabase(context, READ);
- }
- public static SQLiteDatabase getWritableDatabase(Context context) {
- return getDatabase(context, WRITE);
- }
- static public int get_option_value(Context context, String name, int default_value) {
- String s = get_option_value(context, name, String.valueOf(default_value));
+ public static final String OPT_LAST_SCRAPE = "last_scrape";
+ @NonNls
+ 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));
try {
- return Integer.parseInt(s);
+ return Long.parseLong(s);
}
catch (Exception e) {
- Log.d("db", "returning default int value of " + name, e);
+ debug("db", "returning default long value of " + name, e);
return default_value;
}
}
-
- static public long get_option_value(Context context, String name, long default_value) {
- String s = get_option_value(context, name, String.valueOf(default_value));
- try {
- return Long.parseLong(s);
+ 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_id=? and name=?",
+ new String[]{String.valueOf(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) {
- Log.d("db", "returning default long value of " + name, e);
+ debug("db", "returning default value for " + name, e);
return default_value;
}
}
-
- static public String get_option_value(Context context, String name, String default_value) {
- Log.d("db", "about to fetch option " + name);
- try (SQLiteDatabase db = getReadableDatabase(context)) {
- 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;
+ static public void setOption(String name, String value) {
+ debug("option", String.format("%s := %s", 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));
+ }
+ 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 return default_value;
}
catch (Exception e) {
- Log.d("db", "returning default value for " + name, e);
- return default_value;
+ callbackHelper.onException(e);
}
- }
- }
-
- static public void set_option_value(Context context, String name, String value) {
- Log.d("db", "setting option " + name + "=" + value);
- try (SQLiteDatabase db = getWritableDatabase(context)) {
- db.execSQL("insert or replace into options(name, value) values(?, ?);",
- new String[]{name, value});
- }
- }
-
- static public void set_option_value(Context context, String name, long value) {
- set_option_value(context, name, String.valueOf(value));
- }
-}
-
-class MobileLedgerDatabase extends SQLiteOpenHelper implements AutoCloseable {
- public static final String DB_NAME = "mobile-ledger.db";
- public static final int LATEST_REVISION = 8;
-
- 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);
- }
-
- @Override
- public void onCreate(SQLiteDatabase db) {
- Log.d("db", "onCreate called");
- onUpgrade(db, -1, LATEST_REVISION);
- }
-
- @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);
- }
-
- 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);
+ 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() {}
}
}
+