X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2FMainModel.java;h=5ca0e0be00c4cc5e05c73751a16be9eaba6e5ebc;hb=a70ab69ce240fe26b46da00236f2f41844e7392a;hp=9572ea0d678eeffb152148da5b5123a65847f20d;hpb=5bba2c06a81c87327fdcf3f2a85c3206d932c2f9;p=mobile-ledger-staging.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 9572ea0d..5ca0e0be 100644
--- a/app/src/main/java/net/ktnx/mobileledger/ui/MainModel.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/MainModel.java
@@ -32,6 +32,7 @@ import net.ktnx.mobileledger.App;
 import net.ktnx.mobileledger.async.RetrieveTransactionsTask;
 import net.ktnx.mobileledger.async.TransactionAccumulator;
 import net.ktnx.mobileledger.async.UpdateTransactionsTask;
+import net.ktnx.mobileledger.model.AccountListItem;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerAccount;
 import net.ktnx.mobileledger.model.LedgerTransaction;
@@ -55,17 +56,17 @@ import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public class MainModel extends ViewModel {
     public final MutableLiveData<Integer> foundTransactionItemIndex = new MutableLiveData<>(null);
-    public final MutableLiveData<Date> lastUpdateDate = new MutableLiveData<>(null);
     private final MutableLiveData<Boolean> updatingFlag = new MutableLiveData<>(false);
     private final MutableLiveData<String> accountFilter = new MutableLiveData<>();
     private final MutableLiveData<List<TransactionListItem>> displayedTransactions =
             new MutableLiveData<>(new ArrayList<>());
-    private final MutableLiveData<List<LedgerAccount>> displayedAccounts = new MutableLiveData<>();
+    private final MutableLiveData<List<AccountListItem>> displayedAccounts =
+            new MutableLiveData<>();
     private final Locker accountsLocker = new Locker();
     private final MutableLiveData<String> updateError = new MutableLiveData<>();
+    private final Map<String, LedgerAccount> accountMap = new HashMap<>();
     private MobileLedgerProfile profile;
     private List<LedgerAccount> allAccounts = new ArrayList<>();
-    private Map<String, LedgerAccount> accountMap = new HashMap<>();
     private SimpleDate firstTransactionDate;
     private SimpleDate lastTransactionDate;
     transient private RetrieveTransactionsTask retrieveTransactionsTask;
@@ -123,11 +124,11 @@ public class MainModel extends ViewModel {
 
         return merged;
     }
-    private void setLastUpdateStamp() {
+    private void setLastUpdateStamp(long transactionCount) {
         debug("db", "Updating transaction value stamp");
         Date now = new Date();
         profile.setLongOption(MLDB.OPT_LAST_SCRAPE, now.getTime());
-        lastUpdateDate.postValue(now);
+        Data.lastUpdateDate.postValue(now);
     }
     public void scheduleTransactionListReload() {
         UpdateTransactionsTask task = new UpdateTransactionsTask();
@@ -146,8 +147,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(transactionCount);
     }
     public SimpleDate getFirstTransactionDate() {
         return firstTransactionDate;
@@ -209,7 +211,7 @@ public class MainModel extends ViewModel {
             updateAccountsMap(allAccounts);
         }
     }
-    public LiveData<List<LedgerAccount>> getDisplayedAccounts() {
+    public LiveData<List<AccountListItem>> getDisplayedAccounts() {
         return displayedAccounts;
     }
     synchronized public void scheduleAccountListReload() {
@@ -226,7 +228,7 @@ public class MainModel extends ViewModel {
             List<LedgerAccount> accounts, List<LedgerTransaction> transactions) {
         profile.storeAccountAndTransactionListAsync(accounts, transactions);
 
-        setLastUpdateStamp();
+        setLastUpdateStamp(transactions.size());
 
         mergeAccountListFromWeb(accounts);
         updateDisplayedAccounts();
@@ -274,8 +276,8 @@ public class MainModel extends ViewModel {
     }
 
     static class AccountListLoader extends Thread {
-        private MobileLedgerProfile profile;
-        private MainModel model;
+        private final MobileLedgerProfile profile;
+        private final MainModel model;
         AccountListLoader(MobileLedgerProfile profile, MainModel model) {
             this.profile = profile;
             this.model = model;
@@ -355,21 +357,25 @@ public class MainModel extends ViewModel {
         }
         @Override
         public void run() {
-            List<LedgerAccount> newDisplayed = new ArrayList<>();
+            List<AccountListItem> newDisplayed = new ArrayList<>();
             Logger.debug("dFilter", "waiting for synchronized block");
             Logger.debug("dFilter", String.format(Locale.US,
                     "entered synchronized block (about to examine %d accounts)", list.size()));
+            newDisplayed.add(new AccountListItem());    // header
+
+            int count = 0;
             for (LedgerAccount a : list) {
-                if (isInterrupted()) {
+                if (isInterrupted())
                     return;
-                }
 
                 if (a.isVisible()) {
-                    newDisplayed.add(a);
+                    newDisplayed.add(new AccountListItem(a));
+                    count++;
                 }
             }
             if (!isInterrupted()) {
                 model.displayedAccounts.postValue(newDisplayed);
+                Data.lastUpdateAccountCount.postValue(count);
             }
             Logger.debug("dFilter", "left synchronized block");
         }