X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;h=35f39358c46efa6d0634bea443c6a5bb01501af5;hb=5df10dc0b58df4d4be4e9ab34f1e0f477ca46766;hp=dfd1cd673fa888f05f8f355d24f143f7b1078b9e;hpb=d950ff439017c6f22b1efabf08df1fe0f4a5674a;p=mobile-ledger.git

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 dfd1cd67..35f39358 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -17,27 +17,21 @@
 
 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.LiveData;
 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.db.DB;
+import net.ktnx.mobileledger.db.Profile;
 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;
 import java.text.ParsePosition;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
@@ -51,8 +45,7 @@ public final class Data {
             new MutableLiveData<>(false);
     public static final MutableLiveData<RetrieveTransactionsTask.Progress> backgroundTaskProgress =
             new MutableLiveData<>();
-    public static final MutableLiveData<ArrayList<MobileLedgerProfile>> profiles =
-            new MutableLiveData<>(null);
+    public static final LiveData<List<Profile>> profiles = DB.get().getProfileDAO().getAllOrdered();
     public static final MutableLiveData<Currency.Position> currencySymbolPosition =
             new MutableLiveData<>();
     public static final MutableLiveData<Boolean> currencyGap = new MutableLiveData<>(true);
@@ -62,10 +55,10 @@ 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<>();
-    private static final MutableLiveData<MobileLedgerProfile> profile =
+    public static final MutableLiveData<String> lastTransactionsUpdateText =
+            new MutableLiveData<>();
+    public static final MutableLiveData<String> lastAccountsUpdateText = new MutableLiveData<>();
+    private static final MutableLiveData<Profile> profile =
             new InertMutableLiveData<>();
     private static final AtomicInteger backgroundTaskCount = new AtomicInteger(0);
     private static final Locker profilesLocker = new Locker();
@@ -76,7 +69,7 @@ public final class Data {
     }
 
     @NonNull
-    public static MobileLedgerProfile getProfile() {
+    public static Profile getProfile() {
         return Objects.requireNonNull(profile.getValue());
     }
     public static void backgroundTaskStarted() {
@@ -93,79 +86,12 @@ public final class Data {
                         cnt));
         backgroundTasksRunning.postValue(cnt > 0);
     }
-    public static void setCurrentProfile(@NonNull MobileLedgerProfile newProfile) {
-        MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid());
+    public static void setCurrentProfile(@NonNull Profile newProfile) {
         profile.setValue(newProfile);
     }
-    public static void postCurrentProfile(@NonNull MobileLedgerProfile newProfile) {
-        MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid());
+    public static void postCurrentProfile(@NonNull Profile newProfile) {
         profile.postValue(newProfile);
     }
-    public static int getProfileIndex(MobileLedgerProfile profile) {
-        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.equals(profile))
-                    return i;
-            }
-
-            return -1;
-        }
-    }
-    @SuppressWarnings("WeakerAccess")
-    public static int getProfileIndex(String profileUUID) {
-        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))
-                    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) {
-        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);
-                }
-            }
-            else {
-                int i = getProfileIndex(profileUUID);
-                if (i == -1)
-                    i = 0;
-                profile = prList.get(i);
-            }
-        }
-        return profile;
-    }
     public static void refreshCurrencyData(Locale locale) {
         NumberFormat formatter = NumberFormat.getCurrencyInstance(locale);
         java.util.Currency currency = formatter.getCurrency();
@@ -210,31 +136,18 @@ public final class Data {
         return numberFormatter.format(number);
     }
     public static void observeProfile(LifecycleOwner lifecycleOwner,
-                                      Observer<MobileLedgerProfile> observer) {
+                                      Observer<Profile> 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