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=4568846fcb73480152feab5ba31e2e619c2bb430;hp=b42f1613f5704dfb52bf24ba08ad606873180683;hb=99c9595cb7bff9a8af5bc5370bda873286bde29b;hpb=74c3711f3a71f54979d7a687e9ac20b903e38ea2
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 b42f1613..4568846f 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
@@ -1,23 +1,24 @@
/*
- * 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.app.Application;
import android.content.Context;
import android.content.res.Resources;
import android.database.Cursor;
@@ -28,49 +29,47 @@ import android.database.sqlite.SQLiteOpenHelper;
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 net.ktnx.mobileledger.async.DescriptionSelectedCallback;
+import net.ktnx.mobileledger.model.Data;
+
+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;
-
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;
+ 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 synchronized SQLiteDatabase getDatabase(DatabaseMode mode) {
+ public static SQLiteDatabase getDatabase() {
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(Context context) {
- return getDatabase(WRITE);
+ SQLiteDatabase db;
+
+ db = dbHelper.getWritableDatabase();
+
+ db.execSQL("pragma case_sensitive_like=ON;");
+ return db;
}
- static public int get_option_value(Context context, String name, int default_value) {
- String s = get_option_value(context, name, String.valueOf(default_value));
+ static public int getIntOption(String name, int default_value) {
+ String s = getOption(name, String.valueOf(default_value));
try {
return Integer.parseInt(s);
}
@@ -79,8 +78,8 @@ public final class MLDB {
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));
+ static public long getLongOption(String name, long default_value) {
+ String s = getOption(name, String.valueOf(default_value));
try {
return Long.parseLong(s);
}
@@ -89,42 +88,49 @@ public final class MLDB {
return default_value;
}
}
- static public String get_option_value(Context context, String name, String default_value) {
+ static public String getOption(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);
+ 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 = default_value;
+ 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;
+ Log.d("db", "option " + name + "=" + result);
+ return result;
}
+ else return default_value;
}
- }
- 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});
+ catch (Exception e) {
+ Log.d("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) {
+ Log.d("option", String.format("%s := %s", name, value));
+ SQLiteDatabase db = MLDB.getDatabase();
+ db.execSQL("insert or replace into options(profile, name, value) values(?, ?, ?);",
+ new String[]{NO_PROFILE, name, value});
+ }
+ static public void setLongOption(String name, long value) {
+ setOption(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) {
+ 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);
+ }
+ @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) {
String[] from = {field};
int[] to = {android.R.id.text1};
SimpleCursorAdapter adapter =
@@ -132,58 +138,86 @@ public final class MLDB {
from, to, 0);
adapter.setStringConversionColumn(1);
- FilterQueryProvider provider = new FilterQueryProvider() {
- @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);
- }
- }
-
- return c;
- }
+ FilterQueryProvider provider = 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);
+ 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, Data.profile.get().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};
+ }
+ Log.d("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);
+ Log.d("autocompletion", String.format("match: %s |%d", match, order));
+ c.newRow().add(i++).add(match);
+ }
+ }
+
+ 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 void init(Context context) {
- MLDB.context = context.getApplicationContext();
+ 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) {
+ Log.d("db", "Closing DB helper");
+ dbHelper.close();
+ dbHelper = null;
+ }
}
- 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 static final String DB_NAME = "MoLe.db";
+ private static final int LATEST_REVISION = 21;
+ private static final String CREATE_DB_SQL = "create_db";
- private final Context mContext;
+ private final Application mContext;
- public MobileLedgerDatabase(Context context) {
+ public MobileLedgerDatabase(Application context) {
super(context, DB_NAME, null, LATEST_REVISION);
Log.d("db", "creating helper instance");
mContext = context;
@@ -193,7 +227,7 @@ class MobileLedgerDatabase extends SQLiteOpenHelper implements AutoCloseable {
@Override
public void onCreate(SQLiteDatabase db) {
Log.d("db", "onCreate called");
- onUpgrade(db, -1, LATEST_REVISION);
+ applyRevisionFile(db, CREATE_DB_SQL);
}
@Override
@@ -203,27 +237,46 @@ class MobileLedgerDatabase extends SQLiteOpenHelper implements AutoCloseable {
}
private void applyRevision(SQLiteDatabase db, int rev_no) {
- final Resources rm = mContext.getResources();
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 revision %d", rev_no));
+ throw new SQLException(String.format(Locale.US, "No resource for %s", rev_file));
db.beginTransaction();
try (InputStream res = rm.openRawResource(res_id)) {
- Log.d("db", "Applying revision " + String.valueOf(rev_no));
+ Log.d("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) {
- db.execSQL(line);
+ 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 revision %d", rev_no));
+ Log.e("db", String.format("Error opening raw resource for %s", rev_file));
e.printStackTrace();
}
finally {