rework transaction retrieval without MainActivity reference

[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 a278a1b6318cd361143cf5d9ae7ef5c5c1b3ead6..c538f57a2deb266ebf1f323c2d7993efd75d6d44 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java
@@ -29,7 +29,6 @@ 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;
@@ -37,7 +36,6 @@ import net.ktnx.mobileledger.utils.MLDB;
 import net.ktnx.mobileledger.utils.ObservableList;
 import net.ktnx.mobileledger.utils.SimpleDate;
 
-import java.lang.ref.WeakReference;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Date;
@@ -66,7 +64,7 @@ public final class Data {
     public static final MutableLiveData<Currency.Position> currencySymbolPosition =
             new MutableLiveData<>();
     public static final MutableLiveData<Boolean> currencyGap = new MutableLiveData<>(true);
-    public static final MutableLiveData<Locale> locale = new MutableLiveData<>(Locale.getDefault());
+    public static final MutableLiveData<Locale> locale = new MutableLiveData<>();
     public static final MutableLiveData<Boolean> drawerOpen = new MutableLiveData<>(false);
     private static final MutableLiveData<MobileLedgerProfile> profile =
             new InertMutableLiveData<>();
@@ -74,6 +72,11 @@ public final class Data {
     private static final Locker profilesLocker = new Locker();
     public static MutableLiveData<Integer> foundTransactionItemIndex = new MutableLiveData<>(null);
     private static RetrieveTransactionsTask retrieveTransactionsTask;
+
+    static {
+        locale.setValue(Locale.getDefault());
+    }
+
     @NonNull
     public static MobileLedgerProfile getProfile() {
         return Objects.requireNonNull(profile.getValue());
@@ -162,7 +165,7 @@ public final class Data {
         }
         return profile;
     }
-    public synchronized static void scheduleTransactionListRetrieval(MainActivity activity) {
+    public synchronized static void scheduleTransactionListRetrieval() {
         if (retrieveTransactionsTask != null) {
             Logger.debug("db", "Ignoring request for transaction retrieval - already active");
             return;
@@ -173,8 +176,7 @@ public final class Data {
             return;
         }
 
-        retrieveTransactionsTask =
-                new RetrieveTransactionsTask(new WeakReference<>(activity), profile.getValue());
+        retrieveTransactionsTask = new RetrieveTransactionsTask(profile.getValue());
         Logger.debug("db", "Created a background transaction retrieval task");
 
         retrieveTransactionsTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
@@ -189,10 +191,10 @@ public final class Data {
     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() : "<none>", symbol));
         String formatted = formatter.format(1234.56f);
         Logger.debug("locale", String.format("1234.56 formats as '%s'", formatted));