X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2FMainModel.java;h=a8b957dc330be48f6a304cce50bd5f5012468b11;hb=HEAD;hp=2355d2a833c2f5192d64887fac87162f39bc9bf2;hpb=96c0c980b90119e043ee1d754cfcaa6115912321;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/MainModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/MainModel.java
index 2355d2a8..a8b957dc 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/MainModel.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/MainModel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021 Damyan Ivanov.
+ * Copyright © 2024 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -17,15 +17,12 @@
 
 package net.ktnx.mobileledger.ui;
 
-import android.os.AsyncTask;
-
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
 
 import net.ktnx.mobileledger.async.RetrieveTransactionsTask;
 import net.ktnx.mobileledger.async.TransactionAccumulator;
-import net.ktnx.mobileledger.async.UpdateTransactionsTask;
 import net.ktnx.mobileledger.db.Profile;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerAccount;
@@ -41,6 +38,7 @@ import java.util.Locale;
 public class MainModel extends ViewModel {
     public final MutableLiveData<Integer> foundTransactionItemIndex = new MutableLiveData<>(null);
     private final MutableLiveData<Boolean> updatingFlag = new MutableLiveData<>(false);
+    private final MutableLiveData<Boolean> showZeroBalanceAccounts = new MutableLiveData<>(true);
     private final MutableLiveData<String> accountFilter = new MutableLiveData<>(null);
     private final MutableLiveData<List<TransactionListItem>> displayedTransactions =
             new MutableLiveData<>(new ArrayList<>());
@@ -48,12 +46,7 @@ public class MainModel extends ViewModel {
     private SimpleDate firstTransactionDate;
     private SimpleDate lastTransactionDate;
     transient private RetrieveTransactionsTask retrieveTransactionsTask;
-    transient private Thread displayedAccountsUpdater;
     private TransactionsDisplayedFilter displayedTransactionsUpdater;
-    public void scheduleTransactionListReload() {
-        UpdateTransactionsTask task = new UpdateTransactionsTask();
-        task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, this);
-    }
     public LiveData<Boolean> getUpdatingFlag() {
         return updatingFlag;
     }
@@ -63,9 +56,9 @@ public class MainModel extends ViewModel {
     public LiveData<List<TransactionListItem>> getDisplayedTransactions() {
         return displayedTransactions;
     }
-    public void setDisplayedTransactions(List<TransactionListItem> list) {
+    public void setDisplayedTransactions(List<TransactionListItem> list, int transactionCount) {
         displayedTransactions.postValue(list);
-        Data.lastUpdateTransactionCount.postValue(list.size());
+        Data.lastUpdateTransactionCount.postValue(transactionCount);
     }
     public SimpleDate getFirstTransactionDate() {
         return firstTransactionDate;
@@ -73,6 +66,7 @@ public class MainModel extends ViewModel {
     public void setFirstTransactionDate(SimpleDate earliestDate) {
         this.firstTransactionDate = earliestDate;
     }
+    public MutableLiveData<Boolean> getShowZeroBalanceAccounts() {return showZeroBalanceAccounts;}
     public MutableLiveData<String> getAccountFilter() {
         return accountFilter;
     }
@@ -88,15 +82,16 @@ public class MainModel extends ViewModel {
             return;
         }
         Profile profile = Data.getProfile();
+        assert profile != null;
 
-        retrieveTransactionsTask = new RetrieveTransactionsTask(this, profile);
+        retrieveTransactionsTask = new RetrieveTransactionsTask(profile);
         Logger.debug("db", "Created a background transaction retrieval task");
 
-        retrieveTransactionsTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+        retrieveTransactionsTask.start();
     }
     public synchronized void stopTransactionsRetrieval() {
         if (retrieveTransactionsTask != null)
-            retrieveTransactionsTask.cancel(true);
+            retrieveTransactionsTask.interrupt();
         else
             Data.backgroundTaskProgress.setValue(null);
     }
@@ -132,7 +127,7 @@ public class MainModel extends ViewModel {
             String accNameFilter = model.getAccountFilter()
                                         .getValue();
 
-            TransactionAccumulator acc = new TransactionAccumulator(accNameFilter);
+            TransactionAccumulator acc = new TransactionAccumulator(accNameFilter, accNameFilter);
             for (LedgerTransaction tr : list) {
                 if (isInterrupted()) {
                     return;