move DB access routines to the application class

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / utils / MLDB.java

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 832d57d759da8ea2b6457170ceec7392d9682fc1..e769be4e8de61ae08491e5e69d42ee7c60a7495f 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/utils/MLDB.java
@@ -18,23 +18,19 @@
 package net.ktnx.mobileledger.utils;
 
 import android.annotation.TargetApi;
 package net.ktnx.mobileledger.utils;
 
 import android.annotation.TargetApi;

-import android.app.Application;

 import android.content.Context;
 import android.content.Context;

-import android.content.res.Resources;

 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.database.Cursor;
 import android.database.MatrixCursor;

-import android.database.SQLException;

 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteDatabase;

-import android.database.sqlite.SQLiteOpenHelper;

 import android.os.AsyncTask;
 import android.os.Build;
 import android.provider.FontsContract;
 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 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;
 import net.ktnx.mobileledger.async.DbOpQueue;
 import net.ktnx.mobileledger.async.DescriptionSelectedCallback;
 import net.ktnx.mobileledger.model.Data;


@@ -42,10 +38,6 @@ import net.ktnx.mobileledger.model.MobileLedgerProfile;
 
 import org.jetbrains.annotations.NonNls;
 
 
 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;
 import java.util.Locale;
 
 import static net.ktnx.mobileledger.utils.Logger.debug;


@@ -57,22 +49,6 @@ public final class MLDB {
     @NonNls
     public static final String OPT_PROFILE_UUID = "profile_uuid";
     private static final String NO_PROFILE = "-";
     @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));
     @SuppressWarnings("unused")
     static public int getIntOption(String name, int default_value) {
         String s = getOption(name, String.valueOf(default_value));


@@ -99,7 +75,7 @@ public final class MLDB {
         AsyncTask<Void, Void, String> t = new AsyncTask<Void, Void, String>() {
             @Override
             protected String doInBackground(Void... params) {
         AsyncTask<Void, Void, String> t = new AsyncTask<Void, Void, String>() {
             @Override
             protected String doInBackground(Void... params) {

-                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}))
                 try (Cursor cursor = db
                         .rawQuery("select value from options where profile = ? and name=?",
                                 new String[]{NO_PROFILE, name}))


@@ -129,7 +105,7 @@ public final class MLDB {
     }
     static public String getOption(String name, String default_value) {
         debug("db", "about to fetch option " + name);
     }
     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}))
         {
         try (Cursor cursor = db.rawQuery("select value from options where profile = ? and name=?",
                 new String[]{NO_PROFILE, name}))
         {


@@ -207,7 +183,7 @@ public final class MLDB {
                 params = new String[]{str, str, str, str};
             }
             debug("autocompletion", sql);
                 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;
 
             try (Cursor matches = db.rawQuery(sql, params)) {
                 int i = 0;


@@ -237,92 +213,5 @@ 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");
-        dbHelper = new MobileLedgerDatabase(context);
-    }
-    public static synchronized void done() {
-        if (dbHelper != null) {
-            debug("db", "Closing DB helper");
-            dbHelper.close();
-            dbHelper = null;
-        }
-    }

 }
 
 }
 

-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();
-        }
-    }
-}