import net.ktnx.mobileledger.async.DescriptionSelectedCallback;
import net.ktnx.mobileledger.model.Data;
+import net.ktnx.mobileledger.model.MobileLedgerProfile;
import org.jetbrains.annotations.NonNls;
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;
+import static net.ktnx.mobileledger.utils.Logger.debug;
public final class MLDB {
public static final String ACCOUNTS_TABLE = "accounts";
@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();
SQLiteDatabase db;
- if (mode == READ) {
- if (helperForReading == null) helperForReading = new MobileLedgerDatabase(context);
- db = helperForReading.getReadableDatabase();
- }
- else {
- if (helperForWriting == null) helperForWriting = new MobileLedgerDatabase(context);
- db = helperForWriting.getWritableDatabase();
- }
+ db = dbHelper.getWritableDatabase();
db.execSQL("pragma case_sensitive_like=ON;");
return db;
}
- public static SQLiteDatabase getReadableDatabase() {
- return getDatabase(READ);
- }
- public static SQLiteDatabase getWritableDatabase() {
- return getDatabase(WRITE);
- }
static public int getIntOption(String name, int default_value) {
String s = getOption(name, String.valueOf(default_value));
try {
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;
}
}
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);
- SQLiteDatabase db = getReadableDatabase();
+ 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}))
{
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));
- SQLiteDatabase db = MLDB.getWritableDatabase();
+ 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});
}
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 =
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);
"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 " +
"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();
+ debug("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));
+ debug("autocompletion", String.format("match: %s |%d", match, order));
c.newRow().add(i++).add(match);
}
}
});
}
}
- 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) {
+ debug("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 = "MoLe.db";
- public static final int LATEST_REVISION = 20;
+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;
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");
- onUpgrade(db, -1, LATEST_REVISION);
+ 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);
}
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));
+ debug("db", "Applying " + rev_file);
InputStreamReader isr = new InputStreamReader(res);
BufferedReader reader = new BufferedReader(isr);
}
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++;
}
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 {
projects / mobile-ledger.git / blobdiff