X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;h=5e08297e3752ca9e0576c9e6e9fd0aa6a75332dd;hp=0414f0d8191dbef98994805f2446d7b5980f68d4;hb=0fc2ddc465cd9b9314ae336e69535020a96a7fbc;hpb=986a0ed61bded7c0a4aba82b6f9f372023d3d3aa

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 0414f0d8..5e08297e 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -19,59 +19,73 @@ package net.ktnx.mobileledger.model;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.util.Log;
 
 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.ObservableList;
 import net.ktnx.mobileledger.utils.ObservableValue;
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.Locale;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import androidx.lifecycle.MutableLiveData;
 
+import static net.ktnx.mobileledger.utils.Logger.debug;
+
 public final class Data {
     public static ObservableList<TransactionListItem> transactions =
             new ObservableList<>(new ArrayList<>());
     public static ObservableList<LedgerAccount> accounts = new ObservableList<>(new ArrayList<>());
-    private static AtomicInteger backgroundTaskCount = new AtomicInteger(0);
     public static MutableLiveData<Boolean> backgroundTasksRunning = new MutableLiveData<>(false);
     public static MutableLiveData<Date> lastUpdateDate = new MutableLiveData<>();
-    public static ObservableValue<MobileLedgerProfile> profile = new ObservableValue<>();
-    public static ObservableList<MobileLedgerProfile> profiles =
-            new ObservableList<>(new ArrayList<>());
+    public static MutableLiveData<MobileLedgerProfile> profile = new MutableLiveData<>();
+    public static MutableLiveData<ArrayList<MobileLedgerProfile>> profiles =
+            new MutableLiveData<>(new ArrayList<>());
     public static ObservableValue<Boolean> optShowOnlyStarred = new ObservableValue<>();
     public static MutableLiveData<String> accountFilter = new MutableLiveData<>();
+    private static AtomicInteger backgroundTaskCount = new AtomicInteger(0);
+    private static Locker profilesLocker = new Locker();
     public static void backgroundTaskStarted() {
         int cnt = backgroundTaskCount.incrementAndGet();
-        Log.d("data", String.format("background task count is %d after incrementing", cnt));
+        debug("data",
+                String.format(Locale.ENGLISH, "background task count is %d after incrementing",
+                        cnt));
         backgroundTasksRunning.postValue(cnt > 0);
     }
     public static void backgroundTaskFinished() {
         int cnt = backgroundTaskCount.decrementAndGet();
-        Log.d("data", String.format("background task count is %d after decrementing", cnt));
+        debug("data",
+                String.format(Locale.ENGLISH, "background task count is %d after decrementing",
+                        cnt));
         backgroundTasksRunning.postValue(cnt > 0);
     }
     public static void setCurrentProfile(MobileLedgerProfile newProfile) {
         MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid());
-        profile.set(newProfile);
+        profile.postValue(newProfile);
     }
     public static int getProfileIndex(MobileLedgerProfile profile) {
-        try (LockHolder lh = profiles.lockForReading()) {
-            for (int i = 0; i < profiles.size(); i++) {
-                MobileLedgerProfile p = profiles.get(i);
+        try (LockHolder ignored = profilesLocker.lockForReading()) {
+            List<MobileLedgerProfile> prList = profiles.getValue();
+            assert prList != null;
+            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 lh = profiles.lockForReading()) {
-            for (int i = 0; i < profiles.size(); i++) {
-                MobileLedgerProfile p = profiles.get(i);
+        try (LockHolder ignored = profilesLocker.lockForReading()) {
+            List<MobileLedgerProfile> prList = profiles.getValue();
+            assert prList != null;
+            for (int i = 0; i < prList.size(); i++) {
+                MobileLedgerProfile p = prList.get(i);
                 if (p.getUuid().equals(profileUUID)) return i;
             }
 
@@ -93,14 +107,19 @@ public final class Data {
     }
     public static MobileLedgerProfile getProfile(String profileUUID) {
         MobileLedgerProfile profile;
-        if (profiles.isEmpty()) {
-            profile = MobileLedgerProfile.loadAllFromDB(profileUUID);
-        }
-        else {
-            try (LockHolder lh = profiles.lockForReading()) {
+        try (LockHolder readLock = profilesLocker.lockForReading()) {
+            List<MobileLedgerProfile> prList = profiles.getValue();
+            assert prList != null;
+            if (prList.isEmpty()) {
+                readLock.close();
+                try (LockHolder ignored = profilesLocker.lockForWriting()) {
+                    profile = MobileLedgerProfile.loadAllFromDB(profileUUID);
+                }
+            }
+            else {
                 int i = getProfileIndex(profileUUID);
                 if (i == -1) i = 0;
-                profile = profiles.get(i);
+                profile = prList.get(i);
             }
         }
         return profile;