]> git.ktnx.net Git - mobile-ledger-staging.git/blobdiff - app/src/main/java/net/ktnx/mobileledger/model/Data.java
fixed a hard to reproduce crash upon returning to the app
[mobile-ledger-staging.git] / app / src / main / java / net / ktnx / mobileledger / model / Data.java
index 0539c136706e54a2bbf2640b2ca51442fdbc068e..f0f3987789e56673285923eee2209dc915d10b13 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019 Damyan Ivanov.
+ * Copyright © 2020 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -19,46 +19,63 @@ package net.ktnx.mobileledger.model;
 
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.os.AsyncTask;
 
+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.ui.activity.MainActivity;
 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.lang.ref.WeakReference;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
 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<>());
-    public static MutableLiveData<Boolean> backgroundTasksRunning = new MutableLiveData<>(false);
-    public static MutableLiveData<Date> lastUpdateDate = new MutableLiveData<>();
-    public static MutableLiveData<MobileLedgerProfile> profile = new MutableLiveData<>();
-    public static MutableLiveData<ArrayList<MobileLedgerProfile>> profiles =
+    public static final MutableLiveData<Boolean> backgroundTasksRunning =
+            new MutableLiveData<>(false);
+    public static final MutableLiveData<RetrieveTransactionsTask.Progress> backgroundTaskProgress =
+            new MutableLiveData<>();
+    public static final MutableLiveData<ArrayList<MobileLedgerProfile>> profiles =
             new MutableLiveData<>(null);
-    public static MutableLiveData<String> accountFilter = new MutableLiveData<>();
-    public static MutableLiveData<Currency.Position> currencySymbolPosition =
+    public static final MutableLiveData<Currency.Position> currencySymbolPosition =
             new MutableLiveData<>();
-    public static MutableLiveData<Boolean> currencyGap = new MutableLiveData<>(true);
-    public static MutableLiveData<Locale> locale = new MutableLiveData<>(Locale.getDefault());
-    private static AtomicInteger backgroundTaskCount = new AtomicInteger(0);
-    private static Locker profilesLocker = new Locker();
-    private static RetrieveTransactionsTask retrieveTransactionsTask;
+    public static final MutableLiveData<Boolean> currencyGap = new MutableLiveData<>(true);
+    public static final MutableLiveData<Locale> locale = new MutableLiveData<>();
+    public static final MutableLiveData<Boolean> drawerOpen = new MutableLiveData<>(false);
+    public static final MutableLiveData<Date> lastUpdateDate = new MutableLiveData<>(null);
+    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 =
+            new InertMutableLiveData<>();
+    private static final AtomicInteger backgroundTaskCount = new AtomicInteger(0);
+    private static final Locker profilesLocker = new Locker();
+
+    static {
+        locale.setValue(Locale.getDefault());
+    }
+
+    @NonNull
+    public static MobileLedgerProfile getProfile() {
+        return Objects.requireNonNull(profile.getValue());
+    }
     public static void backgroundTaskStarted() {
         int cnt = backgroundTaskCount.incrementAndGet();
         debug("data",
@@ -73,9 +90,12 @@ public final class Data {
                         cnt));
         backgroundTasksRunning.postValue(cnt > 0);
     }
-    public static void setCurrentProfile(MobileLedgerProfile newProfile) {
-        MLDB.setOption(MLDB.OPT_PROFILE_UUID, (newProfile == null) ? null : newProfile.getUuid());
-        stopTransactionsRetrieval();
+    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) {
@@ -123,6 +143,7 @@ public final class Data {
 
         return -1;
     }
+    @Nullable
     public static MobileLedgerProfile getProfile(String profileUUID) {
         MobileLedgerProfile profile;
         try (LockHolder readLock = profilesLocker.lockForReading()) {
@@ -142,37 +163,13 @@ public final class Data {
         }
         return profile;
     }
-    public synchronized static void scheduleTransactionListRetrieval(MainActivity activity) {
-        if (retrieveTransactionsTask != null) {
-            Logger.debug("db", "Ignoring request for transaction retrieval - already active");
-            return;
-        }
-        MobileLedgerProfile pr = profile.getValue();
-        if (pr == null) {
-            Logger.debug("ui", "Ignoring refresh -- no current profile");
-            return;
-        }
-
-        retrieveTransactionsTask =
-                new RetrieveTransactionsTask(new WeakReference<>(activity), profile.getValue());
-        Logger.debug("db", "Created a background transaction retrieval task");
-
-        retrieveTransactionsTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-    }
-    public static synchronized void stopTransactionsRetrieval() {
-        if (retrieveTransactionsTask != null)
-            retrieveTransactionsTask.cancel(false);
-    }
-    public static void transactionRetrievalDone() {
-        retrieveTransactionsTask = null;
-    }
     public static void refreshCurrencyData(Locale locale) {
         NumberFormat formatter = NumberFormat.getCurrencyInstance(locale);
         java.util.Currency currency = formatter.getCurrency();
-        String symbol = currency.getSymbol();
+        String symbol = currency != null ? currency.getSymbol() : "";
         Logger.debug("locale", String.format(
                 "Discovering currency symbol position for locale %s (currency is %s; symbol is %s)",
-                locale.toString(), currency.toString(), symbol));
+                locale.toString(), currency != null ? currency.toString() : "<none>", symbol));
         String formatted = formatter.format(1234.56f);
         Logger.debug("locale", String.format("1234.56 formats as '%s'", formatted));
 
@@ -194,4 +191,24 @@ public final class Data {
             currencySymbolPosition.setValue(Currency.Position.none);
     }
 
+    public static void observeProfile(LifecycleOwner lifecycleOwner,
+                                      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);
+    }
 }
\ No newline at end of file