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=442f610b469dc016dddf5e64b68c7a4e34059de1;hp=c11ea8486182839e89c3667ee23d5acc82e1aea8;hb=21b5399a3f4359ee2b8ff1395c2f892dafa8376b;hpb=b011feba6b09f35a0e07c9502f126877b5f05905
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..442f610b 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 © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * 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,10 +29,16 @@ 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;
@@ -44,9 +51,12 @@ 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";
+ 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 helperForReading, helperForWriting;
- private static Context context;
+ private static Application context;
private static void checkState() {
if (context == null)
throw new IllegalStateException("First call init with a valid context");
@@ -69,8 +79,8 @@ public final class MLDB {
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));
+ static public int getIntOption(String name, int default_value) {
+ String s = getOption(name, String.valueOf(default_value));
try {
return Integer.parseInt(s);
}
@@ -79,8 +89,8 @@ public final class MLDB {
return default_value;
}
}
- static public long get_option_value(String name, long default_value) {
- String s = get_option_value(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 +99,50 @@ public final class MLDB {
return default_value;
}
}
- static public String get_option_value(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 = getReadableDatabase();
+ 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(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});
+ catch (Exception e) {
+ Log.d("db", "returning default value for " + name, e);
+ return default_value;
}
}
- static public void set_option_value(String name, long value) {
- set_option_value(name, String.valueOf(value));
+ static public void setOption(String name, String value) {
+ Log.d("option", String.format("%s := %s", name, value));
+ SQLiteDatabase db = MLDB.getWritableDatabase();
+ 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 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 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,
+ final View nextView,
+ final DescriptionSelectedCallback callback) {
String[] from = {field};
int[] to = {android.R.id.text1};
SimpleCursorAdapter adapter =
@@ -132,58 +150,83 @@ 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.getReadableDatabase();
+ 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 void init(Application context) {
+ MLDB.context = context;
}
+ public static void done() {
+ if (helperForReading != null) helperForReading.close();
+
+ if ((helperForWriting != helperForReading) && (helperForWriting != null))
+ helperForWriting.close();
+ }
+
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;
+ public static final String DB_NAME = "MoLe.db";
+ public static final int LATEST_REVISION = 17;
- 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;
@@ -216,8 +259,25 @@ class MobileLedgerDatabase extends SQLiteOpenHelper implements AutoCloseable {
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 revision %d, line %d", rev_no, line_no),
+ e);
+ }
+ line_no++;
}
db.setTransactionSuccessful();