Data.setCurrentProfile: use setValue() instead of postValue()

[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 9b832b0353e0dcd561b1a8c708624082d3f0fc47..0bdbb1a229faa104af945fdab812ba4ad078ec45 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -54,6 +54,8 @@ public final class Data {
     public static MutableLiveData<String> accountFilter = new MutableLiveData<>();
     public static MutableLiveData<Currency.Position> currencySymbolPosition =
             new MutableLiveData<>();
+    public static MutableLiveData<Boolean> currencyGap = new MutableLiveData<>(true);
+    public static MutableLiveData<Locale> locale = new MutableLiveData<>(Locale.getDefault());
     private static AtomicInteger backgroundTaskCount = new AtomicInteger(0);
     private static Locker profilesLocker = new Locker();
     private static RetrieveTransactionsTask retrieveTransactionsTask;
@@ -74,7 +76,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()) {
@@ -146,8 +148,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());
@@ -165,16 +169,27 @@ public final class Data {
     public static void refreshCurrencyData(Locale locale) {
         NumberFormat formatter = NumberFormat.getCurrencyInstance(locale);
         java.util.Currency currency = formatter.getCurrency();
-        Logger.debug("locale",
-                String.format("Discovering currency symbol position for locale %s (currency is %s)",
-                        locale.toString(), currency.toString()));
+        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));
-        String symbol = currency.getSymbol();
-        if (formatted.startsWith(symbol))
+
+        if (formatted.startsWith(symbol)) {
             currencySymbolPosition.setValue(Currency.Position.before);
-        else if (formatted.endsWith(symbol))
+
+            // 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);
     }