drop MobileLedgerDatabase, move initComplete to DB

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / db / DB.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/db/DB.java b/app/src/main/java/net/ktnx/mobileledger/db/DB.java
index ca2d9092bd7f693e765565980456cae9628f8c4e..cff1d9c14f62452ad80c0af679e81099477a1263 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/db/DB.java
+++ b/app/src/main/java/net/ktnx/mobileledger/db/DB.java
@@ -22,6 +22,7 @@ import android.database.Cursor;
 import android.database.SQLException;
 
 import androidx.annotation.NonNull;
+import androidx.lifecycle.MutableLiveData;
 import androidx.room.Database;
 import androidx.room.Room;
 import androidx.room.RoomDatabase;
@@ -37,7 +38,9 @@ import net.ktnx.mobileledger.dao.OptionDAO;
 import net.ktnx.mobileledger.dao.ProfileDAO;
 import net.ktnx.mobileledger.dao.TemplateAccountDAO;
 import net.ktnx.mobileledger.dao.TemplateHeaderDAO;
+import net.ktnx.mobileledger.dao.TransactionAccountDAO;
 import net.ktnx.mobileledger.dao.TransactionDAO;
+import net.ktnx.mobileledger.utils.Logger;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -57,6 +60,7 @@ import static net.ktnx.mobileledger.utils.Logger.debug;
 abstract public class DB extends RoomDatabase {
     public static final int REVISION = 59;
     public static final String DB_NAME = "MoLe.db";
+    public static final MutableLiveData<Boolean> initComplete = new MutableLiveData<>(false);
     private static DB instance;
     public static DB get() {
         if (instance != null)
@@ -120,6 +124,15 @@ abstract public class DB extends RoomDatabase {
             }
         };
     }
+    private static Migration dummyVersionMigration(int toVersion) {
+        return new Migration(toVersion - 1, toVersion) {
+            @Override
+            public void migrate(@NonNull SupportSQLiteDatabase db) {
+                Logger.debug("db",
+                        String.format(Locale.ROOT, "Dummy DB migration to version %d", toVersion));
+            }
+        };
+    }
     private static Migration multiVersionMigration(int fromVersion, int toVersion) {
         return new Migration(fromVersion, toVersion) {
             @Override
@@ -196,6 +209,8 @@ abstract public class DB extends RoomDatabase {
 
     public abstract TransactionDAO getTransactionDAO();
 
+    public abstract TransactionAccountDAO getTransactionAccountDAO();
+
     public abstract OptionDAO getOptionDAO();
 
     public abstract DescriptionHistoryDAO getDescriptionHistoryDAO();