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=a7e124d7735ce8d83049295eac380f172f7db391;hb=99c9595cb7bff9a8af5bc5370bda873286bde29b;hpb=abd5a19252bf81af903c3406132030e3ad63704f

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 a7e124d7..4568846f 100644
--- a/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
@@ -58,12 +58,11 @@ public final class MLDB {
         if (context == null)
             throw new IllegalStateException("First call init with a valid context");
     }
-    public static synchronized SQLiteDatabase getDatabase() {
+    public static SQLiteDatabase getDatabase() {
         checkState();
 
         SQLiteDatabase db;
 
-        if (dbHelper == null) dbHelper = new MobileLedgerDatabase(context);
         db = dbHelper.getWritableDatabase();
 
         db.execSQL("pragma case_sensitive_like=ON;");
@@ -196,20 +195,25 @@ public final class MLDB {
             });
         }
     }
-    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() {
+    public static synchronized void done() {
         if (dbHelper != null) {
             Log.d("db", "Closing DB helper");
             dbHelper.close();
+            dbHelper = null;
         }
     }
 }
 
 class MobileLedgerDatabase extends SQLiteOpenHelper implements AutoCloseable {
-    public static final String DB_NAME = "MoLe.db";
-    public static final int LATEST_REVISION = 20;
+    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;
 
@@ -223,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
@@ -233,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);
 
@@ -261,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++;
             }
@@ -270,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 {