X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2FMainModel.java;h=039e24df6c45ed9495b09056efad4661debee203;hb=0b96f4968cd5c0b36474b94b94ec6dcf6699f60c;hp=c860e41b4f4e691e7011d3ad60bf22ae8c7ff9d9;hpb=5df10dc0b58df4d4be4e9ab34f1e0f477ca46766;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 c860e41b..039e24df 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/MainModel.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/MainModel.java @@ -18,7 +18,6 @@ package net.ktnx.mobileledger.ui; import android.os.AsyncTask; -import android.text.TextUtils; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; @@ -83,21 +82,6 @@ public class MainModel extends ViewModel { public void setLastTransactionDate(SimpleDate latestDate) { this.lastTransactionDate = latestDate; } - private void applyTransactionFilter(List list) { - final String accFilter = accountFilter.getValue(); - ArrayList newList = new ArrayList<>(); - - TransactionAccumulator accumulator = new TransactionAccumulator(this); - if (TextUtils.isEmpty(accFilter)) - for (LedgerTransaction tr : list) - newList.add(new TransactionListItem(tr)); - else - for (LedgerTransaction tr : list) - if (tr.hasAccountNamedLike(accFilter)) - newList.add(new TransactionListItem(tr)); - - displayedTransactions.postValue(newList); - } public synchronized void scheduleTransactionListRetrieval() { if (retrieveTransactionsTask != null) { Logger.debug("db", "Ignoring request for transaction retrieval - already active"); @@ -113,6 +97,8 @@ public class MainModel extends ViewModel { public synchronized void stopTransactionsRetrieval() { if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(true); + else + Data.backgroundTaskProgress.setValue(null); } public void transactionRetrievalDone() { retrieveTransactionsTask = null;