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=b35579361ea84fed32384b8256f88c5024b28c6b;hb=99c9595cb7bff9a8af5bc5370bda873286bde29b;hpb=633b0b0e42f15aaef50ea7201ff9768fa77dfd02
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 b3557936..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,18 +1,18 @@
/*
* 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;
@@ -34,6 +34,7 @@ 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;
@@ -44,9 +45,6 @@ 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";
@@ -54,32 +52,24 @@ public final class MLDB {
@NonNls
public static final String OPT_PROFILE_UUID = "profile_uuid";
private static final String NO_PROFILE = "-";
- private static MobileLedgerDatabase helperForReading, helperForWriting;
+ 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() {
- return getDatabase(WRITE);
+ SQLiteDatabase db;
+
+ db = dbHelper.getWritableDatabase();
+
+ db.execSQL("pragma case_sensitive_like=ON;");
+ return db;
}
- 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);
}
@@ -88,8 +78,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);
}
@@ -98,9 +88,9 @@ 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);
- SQLiteDatabase db = getReadableDatabase();
+ SQLiteDatabase db = getDatabase();
try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?",
new String[]{NO_PROFILE, name}))
{
@@ -119,27 +109,28 @@ public final class MLDB {
return default_value;
}
}
- static public void set_option_value(String name, String value) {
+ static public void setOption(String name, String value) {
Log.d("option", String.format("%s := %s", name, value));
- SQLiteDatabase db = MLDB.getWritableDatabase();
+ SQLiteDatabase db = MLDB.getDatabase();
db.execSQL("insert or replace into options(profile, name, value) values(?, ?, ?);",
new String[]{NO_PROFILE, name, value});
}
- static public void set_option_value(String name, long value) {
- set_option_value(name, String.valueOf(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,
- final boolean profileSpecific) {
- hook_autocompletion_adapter(context, view, table, field, profileSpecific, null);
+ 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,
- final boolean profileSpecific,
- final View nextView) {
+ 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 =
@@ -175,7 +166,7 @@ public final class MLDB {
params = new String[]{str, str, str, str};
}
Log.d("autocompletion", sql);
- SQLiteDatabase db = MLDB.getReadableDatabase();
+ SQLiteDatabase db = MLDB.getDatabase();
try (Cursor matches = db.rawQuery(sql, params)) {
int i = 0;
@@ -198,25 +189,31 @@ public final class MLDB {
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(Application context) {
+ 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 void done() {
- if (helperForReading != null) helperForReading.close();
-
- if ((helperForWriting != helperForReading) && (helperForWriting != null))
- helperForWriting.close();
+ 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 = 16;
+ 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 Application mContext;
@@ -230,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
@@ -240,15 +237,18 @@ 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);
@@ -268,8 +268,7 @@ class MobileLedgerDatabase extends SQLiteOpenHelper implements AutoCloseable {
}
catch (Exception e) {
throw new RuntimeException(
- String.format("Error applying revision %d, line %d", rev_no, line_no),
- e);
+ String.format("Error applying %s, line %d", rev_file, line_no), e);
}
line_no++;
}
@@ -277,7 +276,7 @@ class MobileLedgerDatabase extends SQLiteOpenHelper implements AutoCloseable {
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 {