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=0bdbb1a229faa104af945fdab812ba4ad078ec45;hp=0902ced5f8d1771d9ad8c853321c15fd5c6b5bc9;hb=ee9dd748619dfc797517e25ac74e43ee6234067c;hpb=23b8360d4f884bbdb20cc2de1825486ef42f37d6 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 0902ced5..0bdbb1a2 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java @@ -19,33 +19,46 @@ package net.ktnx.mobileledger.model; import android.database.Cursor; import android.database.sqlite.SQLiteDatabase; +import android.os.AsyncTask; +import androidx.lifecycle.MutableLiveData; + +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.concurrent.atomic.AtomicInteger; -import androidx.lifecycle.MutableLiveData; - 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<>()); - private static AtomicInteger backgroundTaskCount = new AtomicInteger(0); public static MutableLiveData backgroundTasksRunning = new MutableLiveData<>(false); public static MutableLiveData lastUpdateDate = new MutableLiveData<>(); - public static ObservableValue profile = new ObservableValue<>(); - public static ObservableList profiles = - new ObservableList<>(new ArrayList<>()); - public static ObservableValue optShowOnlyStarred = new ObservableValue<>(); + public static MutableLiveData profile = new MutableLiveData<>(); + 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 void backgroundTaskStarted() { int cnt = backgroundTaskCount.incrementAndGet(); debug("data", @@ -61,14 +74,19 @@ public final class Data { backgroundTasksRunning.postValue(cnt > 0); } public static void setCurrentProfile(MobileLedgerProfile newProfile) { - MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid()); - profile.set(newProfile); + MLDB.setOption(MLDB.OPT_PROFILE_UUID, (newProfile == null) ? null : newProfile.getUuid()); + stopTransactionsRetrieval(); + profile.setValue(newProfile); } public static int getProfileIndex(MobileLedgerProfile profile) { - try (LockHolder ignored = profiles.lockForReading()) { - for (int i = 0; i < profiles.size(); i++) { - MobileLedgerProfile p = profiles.get(i); - if (p.equals(profile)) return i; + try (LockHolder ignored = profilesLocker.lockForReading()) { + List prList = profiles.getValue(); + 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; } return -1; @@ -76,10 +94,15 @@ public final class Data { } @SuppressWarnings("WeakerAccess") public static int getProfileIndex(String profileUUID) { - try (LockHolder ignored = profiles.lockForReading()) { - for (int i = 0; i < profiles.size(); i++) { - MobileLedgerProfile p = profiles.get(i); - if (p.getUuid().equals(profileUUID)) return i; + try (LockHolder ignored = profilesLocker.lockForReading()) { + List prList = profiles.getValue(); + 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; } return -1; @@ -87,29 +110,88 @@ public final class Data { } public static int retrieveCurrentThemeIdFromDb() { String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null); - if (profileUUID == null) return -1; + if (profileUUID == null) + return -1; - SQLiteDatabase db = MLDB.getDatabase(); - try (Cursor c = db - .rawQuery("SELECT theme from profiles where uuid=?", new String[]{profileUUID})) + SQLiteDatabase db = App.getDatabase(); + try (Cursor c = db.rawQuery("SELECT theme from profiles where uuid=?", + new String[]{profileUUID})) { - if (c.moveToNext()) return c.getInt(0); + if (c.moveToNext()) + return c.getInt(0); } return -1; } public static MobileLedgerProfile getProfile(String profileUUID) { MobileLedgerProfile profile; - if (profiles.isEmpty()) { - profile = MobileLedgerProfile.loadAllFromDB(profileUUID); - } - else { - try (LockHolder ignored = profiles.lockForReading()) { + try (LockHolder readLock = profilesLocker.lockForReading()) { + List prList = profiles.getValue(); + if ((prList == null) || prList.isEmpty()) { + readLock.close(); + try (LockHolder ignored = profilesLocker.lockForWriting()) { + profile = MobileLedgerProfile.loadAllFromDB(profileUUID); + } + } + else { int i = getProfileIndex(profileUUID); - if (i == -1) i = 0; - profile = profiles.get(i); + if (i == -1) + i = 0; + profile = prList.get(i); } } 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(); + Logger.debug("locale", String.format( + "Discovering currency symbol position for locale %s (currency is %s; symbol is %s)", + locale.toString(), currency.toString(), symbol)); + String formatted = formatter.format(1234.56f); + Logger.debug("locale", String.format("1234.56 formats as '%s'", formatted)); + + if (formatted.startsWith(symbol)) { + currencySymbolPosition.setValue(Currency.Position.before); + + // is the currency symbol directly followed by the first formatted digit? + final char canary = formatted.charAt(symbol.length()); + currencyGap.setValue(canary != '1'); + } + else if (formatted.endsWith(symbol)) { + currencySymbolPosition.setValue(Currency.Position.after); + + // is the currency symbol directly preceded bu the last formatted digit? + final char canary = formatted.charAt(formatted.length() - symbol.length() - 1); + currencyGap.setValue(canary != '6'); + } + else + currencySymbolPosition.setValue(Currency.Position.none); + } + +} \ No newline at end of file