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=223a61e8aa7ebe621a2df2b3b051c2d589a31378;hp=2a6f0d5f98a4ae41ed56dc4ad48665e0236e6893;hb=112fd782066d4eb759a104eaf7116b310e0d47d5;hpb=90383a155ec16a9f13b1e6ac94a118033e09b3aa

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 2a6f0d5f..223a61e8 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -50,7 +50,7 @@ public final class Data {
     public static MutableLiveData<Date> lastUpdateDate = new MutableLiveData<>();
     public static MutableLiveData<MobileLedgerProfile> profile = new MutableLiveData<>();
     public static MutableLiveData<ArrayList<MobileLedgerProfile>> profiles =
-            new MutableLiveData<>(new ArrayList<>());
+            new MutableLiveData<>(null);
     public static ObservableValue<Boolean> optShowOnlyStarred = new ObservableValue<>();
     public static MutableLiveData<String> accountFilter = new MutableLiveData<>();
     private static AtomicInteger backgroundTaskCount = new AtomicInteger(0);
@@ -71,14 +71,14 @@ public final class Data {
         backgroundTasksRunning.postValue(cnt > 0);
     }
     public static void setCurrentProfile(MobileLedgerProfile newProfile) {
-        MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid());
+        MLDB.setOption(MLDB.OPT_PROFILE_UUID, (newProfile == null) ? null : newProfile.getUuid());
         stopTransactionsRetrieval();
         profile.postValue(newProfile);
     }
     public static int getProfileIndex(MobileLedgerProfile profile) {
         try (LockHolder ignored = profilesLocker.lockForReading()) {
             List<MobileLedgerProfile> prList = profiles.getValue();
-            assert prList != null;
+            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;
@@ -91,7 +91,7 @@ public final class Data {
     public static int getProfileIndex(String profileUUID) {
         try (LockHolder ignored = profilesLocker.lockForReading()) {
             List<MobileLedgerProfile> prList = profiles.getValue();
-            assert prList != null;
+            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;
@@ -117,8 +117,7 @@ public final class Data {
         MobileLedgerProfile profile;
         try (LockHolder readLock = profilesLocker.lockForReading()) {
             List<MobileLedgerProfile> prList = profiles.getValue();
-            assert prList != null;
-            if (prList.isEmpty()) {
+            if ((prList == null) || prList.isEmpty()) {
                 readLock.close();
                 try (LockHolder ignored = profilesLocker.lockForWriting()) {
                     profile = MobileLedgerProfile.loadAllFromDB(profileUUID);
@@ -137,6 +136,9 @@ public final class Data {
             Logger.debug("db", "Ignoring request for transaction retrieval - already active");
             return;
         }
+        MobileLedgerProfile pr = profile.getValue();
+        if (pr == null) throw new IllegalStateException("No current profile");
+
         retrieveTransactionsTask =
                 new RetrieveTransactionsTask(new WeakReference<>(activity), profile.getValue());
         Logger.debug("db", "Created a background transaction retrieval task");