X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=406d0d7364da6f4c4c083529be6357dc72b0b9b4;hb=68cd8ad9a58628674aec13a0d43fd89683728669;hp=04aed0424d9d68f4b7745b72d2c23ca809812bce;hpb=b52d7713c3ae8bd0c8bfc192450ae0672d884aa1;p=mobile-ledger.git

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 04aed042..406d0d73 100644
--- 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;
@@ -456,14 +461,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