X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2FMainModel.java;h=e95aae8c2bc17864d819ae47628bb1966462271e;hb=64413271ef4ed943ae29e9cf9115c1bb77053278;hp=9aafedd50e7e8e8b448cf1030cde8853ee9bde68;hpb=1796886d67b4d62c9fad1ea0980f38f53b8ce3b7;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 9aafedd5..e95aae8c 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/MainModel.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/MainModel.java @@ -25,7 +25,6 @@ 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; @@ -50,10 +49,6 @@ public class MainModel extends ViewModel { 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 getUpdatingFlag() { return updatingFlag; } @@ -63,9 +58,9 @@ public class MainModel extends ViewModel { public LiveData> getDisplayedTransactions() { return displayedTransactions; } - public void setDisplayedTransactions(List list) { + public void setDisplayedTransactions(List list, int transactionCount) { displayedTransactions.postValue(list); - Data.lastUpdateTransactionCount.postValue(list.size()); + Data.lastUpdateTransactionCount.postValue(transactionCount); } public SimpleDate getFirstTransactionDate() { return firstTransactionDate; @@ -127,13 +122,12 @@ public class MainModel extends ViewModel { @Override public void run() { List newDisplayed = new ArrayList<>(); - Logger.debug("dFilter", "waiting for synchronized block"); Logger.debug("dFilter", String.format(Locale.US, "entered synchronized block (about to examine %d transactions)", list.size())); String accNameFilter = model.getAccountFilter() .getValue(); - TransactionAccumulator acc = new TransactionAccumulator(accNameFilter); + TransactionAccumulator acc = new TransactionAccumulator(accNameFilter, accNameFilter); for (LedgerTransaction tr : list) { if (isInterrupted()) { return;