X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Futils%2FMLDB.java;h=ab792ae47d1e7b7c54cb97cc77f5031e40a12713;hp=4f627779b93fb238c9cbe23c4531ff4b19f4232c;hb=1b36e6425230f00d2b6fee293629fd64e59db74b;hpb=e08f8e03661c9780e4a8f291fd04cab2448de19d
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 4f627779..ab792ae4 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
@@ -1,172 +1,211 @@
/*
- * 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 © 2019 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.SQLException;
+import android.database.MatrixCursor;
import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteOpenHelper;
-import android.util.Log;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.provider.FontsContract;
+import android.widget.AutoCompleteTextView;
+import android.widget.FilterQueryProvider;
+import android.widget.SimpleCursorAdapter;
+
+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.MLDB.DatabaseMode.READ;
-import static net.ktnx.mobileledger.utils.MLDB.DatabaseMode.WRITE;
+import static net.ktnx.mobileledger.utils.Logger.debug;
public final class MLDB {
- public enum DatabaseMode {READ, WRITE}
-
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;
-
- 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.getApplicationContext(), READ);
- }
- public static SQLiteDatabase getWritableDatabase(Context context) {
- return getDatabase(context.getApplicationContext(), 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_UUID = "profile_uuid";
+ 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(Context context, String name, long default_value) {
- String s = get_option_value(context, 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(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 getOption(String name, String defaultValue, GetOptCallback cb) {
+ AsyncTask t = new AsyncTask() {
+ @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}))
+ {
+ 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;
}
- else return default_value;
}
- catch (Exception e) {
- Log.d("db", "returning default value for " + name, e);
- return default_value;
+ @Override
+ protected void onPostExecute(String result) {
+ cb.onResult(result);
}
- }
- }
+ };
- 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});
+ 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 = 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;
}
}
-
- static public void set_option_value(Context context, String name, long value) {
- set_option_value(context, name, String.valueOf(value));
+ 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});
}
-}
-
-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);
+ @SuppressWarnings("unused")
+ static public void setLongOption(String name, long value) {
+ setOption(name, String.valueOf(value));
}
-
- @Override
- public void onCreate(SQLiteDatabase db) {
- Log.d("db", "onCreate called");
- onUpgrade(db, -1, LATEST_REVISION);
+ @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[] col_names = {FontsContract.Columns._ID, field};
+ MatrixCursor c = new MatrixCursor(col_names);
+
+ String sql;
+ String[] params;
+ if (profileSpecific) {
+ MobileLedgerProfile p = (profile == null) ? Data.profile.getValue() : profile;
+ if (p == null) throw new AssertionError();
+ 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, p.getUuid(), str};
+ }
+ 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};
+ }
+ debug("autocompletion", sql);
+ SQLiteDatabase db = App.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);
+ }
+ }
- @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);
- }
+ return c;
- 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);
- }
+ };
- db.setTransactionSuccessful();
- }
- catch (IOException e) {
- Log.e("db", String.format("Error opening raw resource for revision %d", rev_no));
- e.printStackTrace();
- }
- finally {
- db.endTransaction();
- }
+ adapter.setFilterQueryProvider(provider);
+
+ view.setAdapter(adapter);
+
+ if (callback != null) view.setOnItemClickListener((parent, itemView, position, id) -> {
+ callback.descriptionSelected(String.valueOf(view.getText()));
+ });
}
}
+