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=27eac04ff8d747da788ce75ed86d00b99ce00cd3;hp=1c67956677188a1f86bfbc02f456134478cdc7ee;hb=f8190806fffcf824f4ae3fba44f37ac8295f978c;hpb=307ffaaba0125a98b3cb867d3db79b2e7a7fb7b5

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 1c679566..27eac04f 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -22,29 +22,45 @@ import android.database.sqlite.SQLiteDatabase;
 
 import net.ktnx.mobileledger.utils.LockHolder;
 import net.ktnx.mobileledger.utils.MLDB;
-import net.ktnx.mobileledger.utils.ObservableAtomicInteger;
 import net.ktnx.mobileledger.utils.ObservableList;
 import net.ktnx.mobileledger.utils.ObservableValue;
 
 import java.util.ArrayList;
 import java.util.Date;
+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<TransactionListItem> transactions =
+            new ObservableList<>(new ArrayList<>());
     public static ObservableList<LedgerAccount> accounts = new ObservableList<>(new ArrayList<>());
-    public static ObservableAtomicInteger backgroundTaskCount = new ObservableAtomicInteger(0);
-    public static ObservableValue<Date> lastUpdateDate = new ObservableValue<>();
+    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 ObservableValue<Boolean> optShowOnlyStarred = new ObservableValue<>();
-    public static ObservableValue<String> accountFilter = new ObservableValue<>();
+    public static MutableLiveData<String> accountFilter = new MutableLiveData<>();
+    public static void backgroundTaskStarted() {
+        int cnt = backgroundTaskCount.incrementAndGet();
+        debug("data", String.format("background task count is %d after incrementing", cnt));
+        backgroundTasksRunning.postValue(cnt > 0);
+    }
+    public static void backgroundTaskFinished() {
+        int cnt = backgroundTaskCount.decrementAndGet();
+        debug("data", String.format("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);
     }
     public static int getProfileIndex(MobileLedgerProfile profile) {
-        try (LockHolder lh = profiles.lockForReading()) {
+        try (LockHolder ignored = profiles.lockForReading()) {
             for (int i = 0; i < profiles.size(); i++) {
                 MobileLedgerProfile p = profiles.get(i);
                 if (p.equals(profile)) return i;
@@ -53,8 +69,9 @@ public final class Data {
             return -1;
         }
     }
+    @SuppressWarnings("WeakerAccess")
     public static int getProfileIndex(String profileUUID) {
-        try (LockHolder lh = profiles.lockForReading()) {
+        try (LockHolder ignored = profiles.lockForReading()) {
             for (int i = 0; i < profiles.size(); i++) {
                 MobileLedgerProfile p = profiles.get(i);
                 if (p.getUuid().equals(profileUUID)) return i;
@@ -68,7 +85,9 @@ public final class Data {
         if (profileUUID == null) return -1;
 
         SQLiteDatabase db = MLDB.getDatabase();
-        try(Cursor c = db.rawQuery("SELECT theme from profiles where uuid=?", new String[]{profileUUID})) {
+        try (Cursor c = db
+                .rawQuery("SELECT theme from profiles where uuid=?", new String[]{profileUUID}))
+        {
             if (c.moveToNext()) return c.getInt(0);
         }
 
@@ -80,7 +99,7 @@ public final class Data {
             profile = MobileLedgerProfile.loadAllFromDB(profileUUID);
         }
         else {
-            try (LockHolder lh = profiles.lockForReading()) {
+            try (LockHolder ignored = profiles.lockForReading()) {
                 int i = getProfileIndex(profileUUID);
                 if (i == -1) i = 0;
                 profile = profiles.get(i);