X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fmodel%2FData.java;h=2cc401980815d250341e3a1da65378c9c196c998;hb=208de18485b4706d133ba820101ccf04ad20e947;hp=cc35638e88770802a830945d03bb412e397847ff;hpb=97510a7f64e94607d713171507a2fb172ecb9c3a;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 cc35638e..2cc40198 100644
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -21,6 +21,9 @@ 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;
@@ -28,17 +31,15 @@ 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 {
@@ -49,9 +50,10 @@ public final class Data {
     public static MutableLiveData<Date> lastUpdateDate = new MutableLiveData<>();
     public static MutableLiveData<MobileLedgerProfile> profile = new MutableLiveData<>();
     public static MutableLiveData<ArrayList<MobileLedgerProfile>> profiles =
-            new MutableLiveData<>(new ArrayList<>());
-    public static ObservableValue<Boolean> optShowOnlyStarred = new ObservableValue<>();
+            new MutableLiveData<>(null);
     public static MutableLiveData<String> accountFilter = new MutableLiveData<>();
+    public static MutableLiveData<Currency.Position> currencySymbolPosition =
+            new MutableLiveData<>();
     private static AtomicInteger backgroundTaskCount = new AtomicInteger(0);
     private static Locker profilesLocker = new Locker();
     private static RetrieveTransactionsTask retrieveTransactionsTask;
@@ -70,14 +72,14 @@ public final class Data {
         backgroundTasksRunning.postValue(cnt > 0);
     }
     public static void setCurrentProfile(MobileLedgerProfile newProfile) {
-        MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid());
+        MLDB.setOption(MLDB.OPT_PROFILE_UUID, (newProfile == null) ? null : newProfile.getUuid());
         stopTransactionsRetrieval();
         profile.postValue(newProfile);
     }
     public static int getProfileIndex(MobileLedgerProfile profile) {
         try (LockHolder ignored = profilesLocker.lockForReading()) {
             List<MobileLedgerProfile> prList = profiles.getValue();
-            assert prList != null;
+            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;
@@ -90,7 +92,7 @@ public final class Data {
     public static int getProfileIndex(String profileUUID) {
         try (LockHolder ignored = profilesLocker.lockForReading()) {
             List<MobileLedgerProfile> prList = profiles.getValue();
-            assert prList != null;
+            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;
@@ -103,7 +105,7 @@ public final class Data {
         String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);
         if (profileUUID == null) return -1;
 
-        SQLiteDatabase db = MLDB.getDatabase();
+        SQLiteDatabase db = App.getDatabase();
         try (Cursor c = db
                 .rawQuery("SELECT theme from profiles where uuid=?", new String[]{profileUUID}))
         {
@@ -116,8 +118,7 @@ public final class Data {
         MobileLedgerProfile profile;
         try (LockHolder readLock = profilesLocker.lockForReading()) {
             List<MobileLedgerProfile> prList = profiles.getValue();
-            assert prList != null;
-            if (prList.isEmpty()) {
+            if ((prList == null) || prList.isEmpty()) {
                 readLock.close();
                 try (LockHolder ignored = profilesLocker.lockForWriting()) {
                     profile = MobileLedgerProfile.loadAllFromDB(profileUUID);
@@ -136,6 +137,9 @@ public final class Data {
             Logger.debug("db", "Ignoring request for transaction retrieval - already active");
             return;
         }
+        MobileLedgerProfile pr = profile.getValue();
+        if (pr == null) throw new IllegalStateException("No current profile");
+
         retrieveTransactionsTask =
                 new RetrieveTransactionsTask(new WeakReference<>(activity), profile.getValue());
         Logger.debug("db", "Created a background transaction retrieval task");
@@ -148,4 +152,21 @@ public final class Data {
     public static void transactionRetrievalDone() {
         retrieveTransactionsTask = null;
     }
-}
+    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 formatted = formatter.format(1234.56f);
+        Logger.debug("locale", String.format("1234.56 formats as '%s'", formatted));
+        String symbol = currency.getSymbol();
+        if (formatted.startsWith(symbol))
+            currencySymbolPosition.setValue(Currency.Position.before);
+        else if (formatted.endsWith(symbol))
+            currencySymbolPosition.setValue(Currency.Position.after);
+        else
+            currencySymbolPosition.setValue(Currency.Position.none);
+    }
+
+}
\ No newline at end of file