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=a735ee9022b2fa91695d4fcc465ff747d5935c92;hb=1b36e6425230f00d2b6fee293629fd64e59db74b;hpb=c81e827812906abf7e59852d15f95055e5d0d0a8 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 a735ee90..ab792ae4 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java @@ -18,22 +18,18 @@ 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; import android.database.MatrixCursor; -import android.database.SQLException; import android.database.sqlite.SQLiteDatabase; -import android.database.sqlite.SQLiteOpenHelper; +import android.os.AsyncTask; 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.App; import net.ktnx.mobileledger.async.DbOpQueue; import net.ktnx.mobileledger.async.DescriptionSelectedCallback; import net.ktnx.mobileledger.model.Data; @@ -41,10 +37,6 @@ 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.Logger.debug; @@ -56,22 +48,6 @@ public final class MLDB { @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 SQLiteDatabase getDatabase() { - checkState(); - - SQLiteDatabase db; - - db = dbHelper.getWritableDatabase(); - - db.execSQL("pragma case_sensitive_like=ON;"); - return db; - } @SuppressWarnings("unused") static public int getIntOption(String name, int default_value) { String s = getOption(name, String.valueOf(default_value)); @@ -94,9 +70,41 @@ public final class MLDB { return default_value; } } + 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; + } + } + @Override + protected void onPostExecute(String result) { + cb.onResult(result); + } + }; + + 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 = getDatabase(); + SQLiteDatabase db = App.getDatabase(); try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?", new String[]{NO_PROFILE, name})) { @@ -127,16 +135,14 @@ public final class MLDB { @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, - Data.profile.getValue()); + 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 View nextView, + final boolean profileSpecific, final DescriptionSelectedCallback callback, final MobileLedgerProfile profile) { String[] from = {field}; @@ -157,13 +163,15 @@ public final class MLDB { 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, profile.getUuid(), str}; + params = new String[]{str, str, str, p.getUuid(), str}; } else { sql = String.format("SELECT %s as a, case when %s_upper LIKE ?||'%%' then 1 " + @@ -174,7 +182,7 @@ public final class MLDB { params = new String[]{str, str, str, str}; } debug("autocompletion", sql); - SQLiteDatabase db = MLDB.getDatabase(); + SQLiteDatabase db = App.getDatabase(); try (Cursor matches = db.rawQuery(sql, params)) { int i = 0; @@ -195,101 +203,9 @@ public final class MLDB { 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 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) { - debug("db", "Closing DB helper"); - dbHelper.close(); - dbHelper = null; - } + if (callback != null) view.setOnItemClickListener((parent, itemView, position, id) -> { + callback.descriptionSelected(String.valueOf(view.getText())); + }); } } -class MobileLedgerDatabase extends SQLiteOpenHelper { - private static final String DB_NAME = "MoLe.db"; - private static final int LATEST_REVISION = 22; - private static final String CREATE_DB_SQL = "create_db"; - - private final Application mContext; - - MobileLedgerDatabase(Application context) { - super(context, DB_NAME, null, LATEST_REVISION); - debug("db", "creating helper instance"); - mContext = context; - super.setWriteAheadLoggingEnabled(true); - } - - @Override - public void onCreate(SQLiteDatabase db) { - debug("db", "onCreate called"); - applyRevisionFile(db, CREATE_DB_SQL); - } - - @Override - public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - debug("db", "onUpgrade called"); - for (int i = oldVersion + 1; i <= newVersion; i++) applyRevision(db, i); - } - - private void applyRevision(SQLiteDatabase db, int rev_no) { - 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 %s", rev_file)); - db.beginTransaction(); - try (InputStream res = rm.openRawResource(res_id)) { - debug("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) { - 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 %s", rev_file)); - e.printStackTrace(); - } - finally { - db.endTransaction(); - } - } -}