setCurrentProfile: no crash if given a null argument

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / model / Data.java

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 7687d237f2279da693d04d27a2448b0e02139b8d..243cb36138dd580e751c2ca31b6ed19688239f27 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -71,7 +71,7 @@ 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);
     }
@@ -136,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");