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=30b77f9c9a4e006b484022f21431a1dd9ac3880c;hp=b5317ad3469e7e3f187e1d86a374a814907b9aeb;hb=f27308fd9e4c8c158e64e6a35967b773f0f7e601;hpb=3586017f5020097a7134d21e32aed4bf3bf37eb9 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 b5317ad3..30b77f9c 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java @@ -36,6 +36,7 @@ import android.widget.SimpleCursorAdapter; import net.ktnx.mobileledger.async.DescriptionSelectedCallback; import net.ktnx.mobileledger.model.Data; +import net.ktnx.mobileledger.model.MobileLedgerProfile; import org.jetbrains.annotations.NonNls; @@ -45,6 +46,8 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.util.Locale; +import static net.ktnx.mobileledger.utils.Logger.debug; + public final class MLDB { public static final String ACCOUNTS_TABLE = "accounts"; public static final String DESCRIPTION_HISTORY_TABLE = "description_history"; @@ -74,7 +77,7 @@ public final class MLDB { 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; } } @@ -84,12 +87,12 @@ public final class MLDB { 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 getOption(String name, String default_value) { - Log.d("db", "about to fetch option " + name); + debug("db", "about to fetch option " + name); SQLiteDatabase db = getDatabase(); try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?", new String[]{NO_PROFILE, name})) @@ -99,18 +102,18 @@ public final class MLDB { if (result == null) result = default_value; - Log.d("db", "option " + name + "=" + result); + debug("db", "option " + name + "=" + result); return result; } else return default_value; } catch (Exception e) { - Log.d("db", "returning default value for " + name, e); + debug("db", "returning default value for " + name, e); return default_value; } } static public void setOption(String name, String value) { - Log.d("option", String.format("%s := %s", name, value)); + debug("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}); @@ -123,14 +126,15 @@ public final class MLDB { final AutoCompleteTextView view, final String table, final String field, final boolean profileSpecific) { - hookAutocompletionAdapter(context, view, table, field, profileSpecific, null, null); + hookAutocompletionAdapter(context, view, table, field, profileSpecific, null, null, Data.profile.get()); } @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) { + final DescriptionSelectedCallback callback, + final MobileLedgerProfile profile) { String[] from = {field}; int[] to = {android.R.id.text1}; SimpleCursorAdapter adapter = @@ -142,7 +146,7 @@ public final class MLDB { if (constraint == null) return null; String str = constraint.toString().toUpperCase(); - Log.d("autocompletion", "Looking for " + str); + debug("autocompletion", "Looking for " + str); String[] col_names = {FontsContract.Columns._ID, field}; MatrixCursor c = new MatrixCursor(col_names); @@ -155,7 +159,7 @@ public final class MLDB { "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}; + params = new String[]{str, str, str, profile.getUuid(), str}; } else { sql = String.format("SELECT %s as a, case when %s_upper LIKE ?||'%%' then 1 " + @@ -165,7 +169,7 @@ public final class MLDB { "ORDER BY 2, 1;", field, field, field, field, table, field); params = new String[]{str, str, str, str}; } - Log.d("autocompletion", sql); + debug("autocompletion", sql); SQLiteDatabase db = MLDB.getDatabase(); try (Cursor matches = db.rawQuery(sql, params)) { @@ -173,7 +177,7 @@ public final class MLDB { while (matches.moveToNext()) { String match = matches.getString(0); int order = matches.getInt(1); - Log.d("autocompletion", String.format("match: %s |%d", match, order)); + debug("autocompletion", String.format("match: %s |%d", match, order)); c.newRow().add(i++).add(match); } } @@ -197,41 +201,42 @@ public final class MLDB { } public static synchronized void init(Application context) { MLDB.context = context; - if (dbHelper != null) throw new IllegalStateException("It appears init() was already called"); + 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"); + debug("db", "Closing DB helper"); dbHelper.close(); dbHelper = null; } } } -class MobileLedgerDatabase extends SQLiteOpenHelper implements AutoCloseable { +class MobileLedgerDatabase extends SQLiteOpenHelper { private static final String DB_NAME = "MoLe.db"; - private static final int LATEST_REVISION = 20; - private static final String CREATE_DB_SQL = "create-db.sql"; + private static final int LATEST_REVISION = 22; + private static final String CREATE_DB_SQL = "create_db"; private final Application mContext; public MobileLedgerDatabase(Application context) { super(context, DB_NAME, null, LATEST_REVISION); - Log.d("db", "creating helper instance"); + debug("db", "creating helper instance"); mContext = context; super.setWriteAheadLoggingEnabled(true); } @Override public void onCreate(SQLiteDatabase db) { - Log.d("db", "onCreate called"); + debug("db", "onCreate called"); applyRevisionFile(db, CREATE_DB_SQL); } @Override public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - Log.d("db", "onUpgrade called"); + debug("db", "onUpgrade called"); for (int i = oldVersion + 1; i <= newVersion; i++) applyRevision(db, i); } @@ -247,7 +252,7 @@ class MobileLedgerDatabase extends SQLiteOpenHelper implements AutoCloseable { 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 " + rev_file); + debug("db", "Applying " + rev_file); InputStreamReader isr = new InputStreamReader(res); BufferedReader reader = new BufferedReader(isr);