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=2289635d7524551b941294f8d7a096ab8212621a;hp=b79ed766c3c59031e6c9a901648960f3917bdf88;hb=5fb830346325e20be596a09118d377b26f09779b;hpb=e980e7f7a49d2f5fcd42b30dc78b5c37f9b0a49b 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 b79ed766..2289635d 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java @@ -48,16 +48,18 @@ public final class Data { public static ObservableList accounts = new ObservableList<>(new ArrayList<>()); public static MutableLiveData backgroundTasksRunning = new MutableLiveData<>(false); public static MutableLiveData lastUpdateDate = new MutableLiveData<>(); - public static MutableLiveData profile = new MutableLiveData<>(); + public static MutableLiveData profile = new InertMutableLiveData<>(); public static MutableLiveData> profiles = new MutableLiveData<>(null); public static MutableLiveData accountFilter = new MutableLiveData<>(); public static MutableLiveData currencySymbolPosition = new MutableLiveData<>(); public static MutableLiveData currencyGap = new MutableLiveData<>(true); + public static MutableLiveData locale = new MutableLiveData<>(Locale.getDefault()); private static AtomicInteger backgroundTaskCount = new AtomicInteger(0); private static Locker profilesLocker = new Locker(); private static RetrieveTransactionsTask retrieveTransactionsTask; + public static MutableLiveData drawerOpen = new MutableLiveData<>(false); public static void backgroundTaskStarted() { int cnt = backgroundTaskCount.incrementAndGet(); debug("data", @@ -75,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()) { @@ -147,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());