X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;h=7c5895a104fc1a6a978acf2e3fb3b06ef932ef03;hb=3608bbfaafd682358234df2cbcca09dd605536e4;hp=1b659ff7d866485d8874b1efcfadafc5d7084186;hpb=0fb03702b44e99bef2a5674d96f025595aed4274;p=mobile-ledger-staging.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 1b659ff7..7c5895a1 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -43,22 +43,23 @@ import java.util.concurrent.atomic.AtomicInteger;
 import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public final class Data {
-    public static ObservableList<TransactionListItem> transactions =
+    public static final 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 ObservableList<LedgerAccount> accounts = new ObservableList<>(new ArrayList<>());
+    public static final MutableLiveData<Boolean> backgroundTasksRunning = new MutableLiveData<>(false);
+    public static final MutableLiveData<Date> lastUpdateDate = new MutableLiveData<>();
+    public static final MutableLiveData<MobileLedgerProfile> profile = new InertMutableLiveData<>();
+    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<String> accountFilter = new MutableLiveData<>();
+    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();
+    public static final MutableLiveData<Boolean> currencyGap = new MutableLiveData<>(true);
+    public static final MutableLiveData<Locale> locale = new MutableLiveData<>(Locale.getDefault());
+    private static final AtomicInteger backgroundTaskCount = new AtomicInteger(0);
+    private static final Locker profilesLocker = new Locker();
     private static RetrieveTransactionsTask retrieveTransactionsTask;
+    public static final MutableLiveData<Boolean> drawerOpen = new MutableLiveData<>(false);
     public static void backgroundTaskStarted() {
         int cnt = backgroundTaskCount.incrementAndGet();
         debug("data",
@@ -76,7 +77,7 @@ public final class Data {
     public static void setCurrentProfile(MobileLedgerProfile newProfile) {
         MLDB.setOption(MLDB.OPT_PROFILE_UUID, (newProfile == null) ? null : newProfile.getUuid());
         stopTransactionsRetrieval();
-        profile.postValue(newProfile);
+        profile.setValue(newProfile);
     }
     public static int getProfileIndex(MobileLedgerProfile profile) {
         try (LockHolder ignored = profilesLocker.lockForReading()) {
@@ -148,8 +149,10 @@ public final class Data {
             return;
         }
         MobileLedgerProfile pr = profile.getValue();
-        if (pr == null)
-            throw new IllegalStateException("No current profile");
+        if (pr == null) {
+            Logger.debug("ui", "Ignoring refresh -- no current profile");
+            return;
+        }
 
         retrieveTransactionsTask =
                 new RetrieveTransactionsTask(new WeakReference<>(activity), profile.getValue());