asynchronous profile initialisation

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / model / Data.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/model/Data.java b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
index dfd1cd673fa888f05f8f355d24f143f7b1078b9e..15d78ac034e475fde08bbf5724282189b98c6dd1 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -17,22 +17,16 @@
 
 package net.ktnx.mobileledger.model;
 
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.Observer;
 
-import net.ktnx.mobileledger.App;
 import net.ktnx.mobileledger.async.RetrieveTransactionsTask;
 import net.ktnx.mobileledger.utils.LockHolder;
 import net.ktnx.mobileledger.utils.Locker;
 import net.ktnx.mobileledger.utils.Logger;
-import net.ktnx.mobileledger.utils.MLDB;
-import net.ktnx.mobileledger.utils.ObservableValue;
 
 import java.text.NumberFormat;
 import java.text.ParseException;
@@ -62,9 +56,9 @@ public final class Data {
     public static final MutableLiveData<Integer> lastUpdateTransactionCount =
             new MutableLiveData<>(0);
     public static final MutableLiveData<Integer> lastUpdateAccountCount = new MutableLiveData<>(0);
-    public static final ObservableValue<String> lastTransactionsUpdateText =
-            new ObservableValue<>();
-    public static final ObservableValue<String> lastAccountsUpdateText = new ObservableValue<>();
+    public static final MutableLiveData<String> lastTransactionsUpdateText =
+            new MutableLiveData<>();
+    public static final MutableLiveData<String> lastAccountsUpdateText = new MutableLiveData<>();
     private static final MutableLiveData<MobileLedgerProfile> profile =
             new InertMutableLiveData<>();
     private static final AtomicInteger backgroundTaskCount = new AtomicInteger(0);
@@ -94,11 +88,9 @@ public final class Data {
         backgroundTasksRunning.postValue(cnt > 0);
     }
     public static void setCurrentProfile(@NonNull MobileLedgerProfile newProfile) {
-        MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid());
         profile.setValue(newProfile);
     }
     public static void postCurrentProfile(@NonNull MobileLedgerProfile newProfile) {
-        MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid());
         profile.postValue(newProfile);
     }
     public static int getProfileIndex(MobileLedgerProfile profile) {
@@ -116,49 +108,33 @@ public final class Data {
         }
     }
     @SuppressWarnings("WeakerAccess")
-    public static int getProfileIndex(String profileUUID) {
+    public static int getProfileIndex(long profileId) {
         try (LockHolder ignored = profilesLocker.lockForReading()) {
             List<MobileLedgerProfile> prList = profiles.getValue();
             if (prList == null)
                 throw new AssertionError();
             for (int i = 0; i < prList.size(); i++) {
                 MobileLedgerProfile p = prList.get(i);
-                if (p.getUuid()
-                     .equals(profileUUID))
+                if (p.getId() == profileId)
                     return i;
             }
 
             return -1;
         }
     }
-    public static int retrieveCurrentThemeIdFromDb() {
-        String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);
-        if (profileUUID == null)
-            return -1;
-
-        SQLiteDatabase db = App.getDatabase();
-        try (Cursor c = db.rawQuery("SELECT theme from profiles where uuid=?",
-                new String[]{profileUUID}))
-        {
-            if (c.moveToNext())
-                return c.getInt(0);
-        }
-
-        return -1;
-    }
     @Nullable
-    public static MobileLedgerProfile getProfile(String profileUUID) {
+    public static MobileLedgerProfile getProfile(long profileId) {
         MobileLedgerProfile profile;
         try (LockHolder readLock = profilesLocker.lockForReading()) {
             List<MobileLedgerProfile> prList = profiles.getValue();
             if ((prList == null) || prList.isEmpty()) {
                 readLock.close();
                 try (LockHolder ignored = profilesLocker.lockForWriting()) {
-                    profile = MobileLedgerProfile.loadAllFromDB(profileUUID);
+                    profile = MobileLedgerProfile.loadAllFromDB(profileId);
                 }
             }
             else {
-                int i = getProfileIndex(profileUUID);
+                int i = getProfileIndex(profileId);
                 if (i == -1)
                     i = 0;
                 profile = prList.get(i);
@@ -213,28 +189,15 @@ public final class Data {
                                       Observer<MobileLedgerProfile> observer) {
         profile.observe(lifecycleOwner, observer);
     }
-    public synchronized static MobileLedgerProfile initProfile() {
-        MobileLedgerProfile currentProfile = profile.getValue();
-        if (currentProfile != null)
-            return currentProfile;
-
-        String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);
-        MobileLedgerProfile startupProfile = getProfile(profileUUID);
-        if (startupProfile != null)
-            setCurrentProfile(startupProfile);
-        Logger.debug("profile", "initProfile() returning " + startupProfile);
-        return startupProfile;
-    }
-
     public static void removeProfileObservers(LifecycleOwner owner) {
         profile.removeObservers(owner);
     }
     public static float parseNumber(String str) throws ParseException {
         ParsePosition pos = new ParsePosition(0);
         Number parsed = numberFormatter.parse(str);
-        if (parsed == null)
+        if (parsed == null || pos.getErrorIndex() > -1)
             throw new ParseException("Error parsing '" + str + "'", pos.getErrorIndex());
 
-        return (float) parsed;
+        return parsed.floatValue();
     }
 }
\ No newline at end of file