X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;h=02ba81d454ad9acddbeadad301091df7a7c251d4;hb=0ce370cea3c5c980b6eeb14acf965188ae951f51;hp=5764434f33b3dbb76f446d97cf9162986f98d1ec;hpb=2c14b80572cc9199f7ed0171786a04931075b50d;p=mobile-ledger.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 5764434f..02ba81d4 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -50,12 +50,9 @@ public final class Data {
             new MutableLiveData<>(null);
     public static final MutableLiveData<SimpleDate> latestTransactionDate =
             new MutableLiveData<>(null);
-    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 final MutableLiveData<String> accountFilter = new MutableLiveData<>();
@@ -63,10 +60,16 @@ public final class Data {
             new MutableLiveData<>();
     public static final MutableLiveData<Boolean> currencyGap = new MutableLiveData<>(true);
     public static final MutableLiveData<Locale> locale = new MutableLiveData<>(Locale.getDefault());
+    private static final MutableLiveData<MobileLedgerProfile> profile =
+            new InertMutableLiveData<>();
     private static final AtomicInteger backgroundTaskCount = new AtomicInteger(0);
     private static final Locker profilesLocker = new Locker();
     public static MutableLiveData<Integer> foundTransactionItemIndex = new MutableLiveData<>(null);
     private static RetrieveTransactionsTask retrieveTransactionsTask;
+    @NonNull
+    public static MobileLedgerProfile getProfile() {
+        return Objects.requireNonNull(profile.getValue());
+    }
     public static final MutableLiveData<Boolean> drawerOpen = new MutableLiveData<>(false);
     public static void backgroundTaskStarted() {
         int cnt = backgroundTaskCount.incrementAndGet();
@@ -82,8 +85,8 @@ 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());
+    public static void setCurrentProfile(@NonNull MobileLedgerProfile newProfile) {
+        MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid());
         stopTransactionsRetrieval();
         profile.setValue(newProfile);
     }
@@ -132,6 +135,7 @@ public final class Data {
 
         return -1;
     }
+    @Nullable
     public static MobileLedgerProfile getProfile(String profileUUID) {
         MobileLedgerProfile profile;
         try (LockHolder readLock = profilesLocker.lockForReading()) {
@@ -203,4 +207,23 @@ 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);
+        return startupProfile;
+    }
+
+    public static void removeProfileObservers(LifecycleOwner owner) {
+        profile.removeObservers(owner);
+    }
 }
\ No newline at end of file