X-Git-Url: https://git.ktnx.net/?p=mobile-ledger-staging.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;h=f0f3987789e56673285923eee2209dc915d10b13;hp=8b4def9509547d89fb4c92c7bd47551167360b3d;hb=8ca38438602c8addcbce91167d467e6da0ba962b;hpb=7979c30fbec50954aa35d66f9e4558f4233824e3 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 8b4def95..f0f39877 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Damyan Ivanov. + * Copyright © 2020 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -19,46 +19,63 @@ package net.ktnx.mobileledger.model; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; -import android.os.AsyncTask; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.Observer; import net.ktnx.mobileledger.App; import net.ktnx.mobileledger.async.RetrieveTransactionsTask; -import net.ktnx.mobileledger.ui.activity.MainActivity; import net.ktnx.mobileledger.utils.LockHolder; import net.ktnx.mobileledger.utils.Locker; import net.ktnx.mobileledger.utils.Logger; import net.ktnx.mobileledger.utils.MLDB; -import net.ktnx.mobileledger.utils.ObservableList; +import net.ktnx.mobileledger.utils.ObservableValue; -import java.lang.ref.WeakReference; import java.text.NumberFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Locale; +import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import static net.ktnx.mobileledger.utils.Logger.debug; public final class Data { - public static ObservableList transactions = - new ObservableList<>(new ArrayList<>()); - 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 InertMutableLiveData<>(); - public static MutableLiveData> profiles = + public static final MutableLiveData backgroundTasksRunning = + new MutableLiveData<>(false); + public static final MutableLiveData backgroundTaskProgress = + new MutableLiveData<>(); + public static final MutableLiveData> profiles = new MutableLiveData<>(null); - public static MutableLiveData accountFilter = new MutableLiveData<>(); - public static MutableLiveData currencySymbolPosition = + public static final 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 final MutableLiveData currencyGap = new MutableLiveData<>(true); + public static final MutableLiveData locale = new MutableLiveData<>(); + public static final MutableLiveData drawerOpen = new MutableLiveData<>(false); + public static final MutableLiveData lastUpdateDate = new MutableLiveData<>(null); + public static final MutableLiveData lastUpdateTransactionCount = + new MutableLiveData<>(0); + public static final MutableLiveData lastUpdateAccountCount = new MutableLiveData<>(0); + public static final ObservableValue lastTransactionsUpdateText = + new ObservableValue<>(); + public static final ObservableValue lastAccountsUpdateText = new ObservableValue<>(); + private static final MutableLiveData profile = + new InertMutableLiveData<>(); + private static final AtomicInteger backgroundTaskCount = new AtomicInteger(0); + private static final Locker profilesLocker = new Locker(); + + static { + locale.setValue(Locale.getDefault()); + } + + @NonNull + public static MobileLedgerProfile getProfile() { + return Objects.requireNonNull(profile.getValue()); + } public static void backgroundTaskStarted() { int cnt = backgroundTaskCount.incrementAndGet(); debug("data", @@ -73,11 +90,14 @@ 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()); - stopTransactionsRetrieval(); + public static void setCurrentProfile(@NonNull MobileLedgerProfile newProfile) { + MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid()); profile.setValue(newProfile); } + public static void postCurrentProfile(@NonNull MobileLedgerProfile newProfile) { + MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid()); + profile.postValue(newProfile); + } public static int getProfileIndex(MobileLedgerProfile profile) { try (LockHolder ignored = profilesLocker.lockForReading()) { List prList = profiles.getValue(); @@ -123,6 +143,7 @@ public final class Data { return -1; } + @Nullable public static MobileLedgerProfile getProfile(String profileUUID) { MobileLedgerProfile profile; try (LockHolder readLock = profilesLocker.lockForReading()) { @@ -142,37 +163,13 @@ public final class Data { } return profile; } - public synchronized static void scheduleTransactionListRetrieval(MainActivity activity) { - if (retrieveTransactionsTask != null) { - Logger.debug("db", "Ignoring request for transaction retrieval - already active"); - return; - } - MobileLedgerProfile pr = profile.getValue(); - if (pr == null) { - Logger.debug("ui", "Ignoring refresh -- no current profile"); - return; - } - - retrieveTransactionsTask = - new RetrieveTransactionsTask(new WeakReference<>(activity), profile.getValue()); - Logger.debug("db", "Created a background transaction retrieval task"); - - retrieveTransactionsTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); - } - public static synchronized void stopTransactionsRetrieval() { - if (retrieveTransactionsTask != null) - retrieveTransactionsTask.cancel(false); - } - public static void transactionRetrievalDone() { - retrieveTransactionsTask = null; - } public static void refreshCurrencyData(Locale locale) { NumberFormat formatter = NumberFormat.getCurrencyInstance(locale); java.util.Currency currency = formatter.getCurrency(); - String symbol = currency.getSymbol(); + String symbol = currency != null ? currency.getSymbol() : ""; Logger.debug("locale", String.format( "Discovering currency symbol position for locale %s (currency is %s; symbol is %s)", - locale.toString(), currency.toString(), symbol)); + locale.toString(), currency != null ? currency.toString() : "", symbol)); String formatted = formatter.format(1234.56f); Logger.debug("locale", String.format("1234.56 formats as '%s'", formatted)); @@ -194,4 +191,24 @@ public final class Data { currencySymbolPosition.setValue(Currency.Position.none); } + public static void observeProfile(LifecycleOwner lifecycleOwner, + Observer 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); + Logger.debug("profile", "initProfile() returning " + startupProfile); + return startupProfile; + } + + public static void removeProfileObservers(LifecycleOwner owner) { + profile.removeObservers(owner); + } } \ No newline at end of file