avoid switching current profile when profiles are rearranged

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / MainActivity.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
index 04aed0424d9d68f4b7745b72d2c23ca809812bce..d9ac65b71aa43ca3b08a42d8c2b17efdf9c7f065 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
@@ -41,6 +41,8 @@ import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -51,11 +53,14 @@ import com.google.android.material.snackbar.Snackbar;
 
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.async.RetrieveTransactionsTask;
+import net.ktnx.mobileledger.async.TransactionAccumulator;
 import net.ktnx.mobileledger.databinding.ActivityMainBinding;
 import net.ktnx.mobileledger.db.DB;
 import net.ktnx.mobileledger.db.Option;
 import net.ktnx.mobileledger.db.Profile;
+import net.ktnx.mobileledger.db.TransactionWithAccounts;
 import net.ktnx.mobileledger.model.Data;
+import net.ktnx.mobileledger.model.LedgerTransaction;
 import net.ktnx.mobileledger.ui.FabManager;
 import net.ktnx.mobileledger.ui.MainModel;
 import net.ktnx.mobileledger.ui.account_summary.AccountSummaryFragment;
@@ -386,7 +391,16 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa
         createShortcuts(newList);
 
         Profile currentProfile = Data.getProfile();
-        if (currentProfile == null || !newList.contains(currentProfile)) {
+        boolean currentProfilePresent = false;
+        if (currentProfile != null) {
+            for (Profile p : newList) {
+                if (p.getId() == currentProfile.getId()) {
+                    currentProfilePresent = true;
+                    break;
+                }
+            }
+        }
+        if (!currentProfilePresent) {
             Logger.debug(TAG, "Switching profile because the current is no longer available");
             Data.setCurrentProfile(newList.get(0));
         }
@@ -456,14 +470,38 @@ public class MainActivity extends ProfileThemedActivity implements FabManager.Fa
             return;
         }
 
-        mainModel.stopTransactionsRetrieval();
+        mainModel.getAccountFilter()
+                 .observe(this, accFilter -> {
+                     Logger.debug(TAG, "account filter changed, reloading transactions");
+//                     mainModel.scheduleTransactionListReload();
+                     LiveData<List<TransactionWithAccounts>> transactions =
+                             new MutableLiveData<>(new ArrayList<TransactionWithAccounts>());
+                     if (profile != null) {
+                         if (accFilter == null || accFilter.isEmpty()) {
+                             transactions = DB.get()
+                                              .getTransactionDAO()
+                                              .getAllWithAccounts(profile.getId());
+                         }
+                         else {
+                             transactions = DB.get()
+                                              .getTransactionDAO()
+                                              .getAllWithAccountsFiltered(profile.getId(),
+                                                      accFilter);
+                         }
+                     }
+
+                     transactions.observe(this, list -> {
+                         TransactionAccumulator accumulator = new TransactionAccumulator(accFilter);
+
+                         for (TransactionWithAccounts tr : list)
+                             accumulator.put(new LedgerTransaction(tr));
+
+                         accumulator.publishResults(mainModel);
+                     });
+                 });
 
+        mainModel.stopTransactionsRetrieval();
         mainModel.clearTransactions();
-
-        if (haveProfile) {
-            Logger.debug("transactions", "requesting list reload");
-            mainModel.scheduleTransactionListReload();
-        }
     }
     private void profileThemeChanged() {
         // un-hook all observed LiveData