X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FRetrieveTransactionsTask.java;h=91ea8ffc55bfe394df8b7001c9d9b7ea90b76b9b;hp=f4d246a66a80f19e02fa388578b11a8ffa94d901;hb=2e6d7c5f759986f89a867ee5b9162496019d5130;hpb=e2054be1e2bd9e4e97f5f80db61a0dc4172bd4d5

diff --git a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
index f4d246a6..91ea8ffc 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -30,6 +30,7 @@ import net.ktnx.mobileledger.model.LedgerTransaction;
 import net.ktnx.mobileledger.model.LedgerTransactionAccount;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.ui.activity.MainActivity;
+import net.ktnx.mobileledger.ui.transaction_list.TransactionListViewModel;
 import net.ktnx.mobileledger.utils.MLDB;
 import net.ktnx.mobileledger.utils.NetworkUtil;
 
@@ -113,6 +114,7 @@ public class RetrieveTransactionsTask
         ArrayList<LedgerTransaction> transactionList = new ArrayList<>();
         HashMap<String, Void> accountNames = new HashMap<>();
         LedgerAccount lastAccount = null;
+        boolean onlyStarred = Data.optShowOnlyStarred.get();
         Data.backgroundTaskCount.incrementAndGet();
         try {
             HttpURLConnection http = NetworkUtil.prepare_connection("journal");
@@ -165,8 +167,11 @@ public class RetrieveTransactionsTask
                                         acct_name = acct_name.replace("\"", "");
                                         L(String.format("found account: %s", acct_name));
 
-                                        profile.storeAccount(acct_name);
-                                        lastAccount = new LedgerAccount(acct_name);
+                                        lastAccount = profile.loadAccount(acct_name);
+                                        if (lastAccount == null) {
+                                            lastAccount = new LedgerAccount(acct_name);
+                                            profile.storeAccount(lastAccount);
+                                        }
 
                                         // make sure the parent account(s) are present,
                                         // synthesising them if necessary
@@ -182,14 +187,17 @@ public class RetrieveTransactionsTask
                                             while (!toAppend.isEmpty()) {
                                                 String aName = toAppend.pop();
                                                 LedgerAccount acc = new LedgerAccount(aName);
-                                                accountList.add(acc);
+                                                acc.setHidden(lastAccount.isHidden());
+                                                if (!onlyStarred || !acc.isHidden())
+                                                    accountList.add(acc);
                                                 L(String.format("gap-filling with %s", aName));
                                                 accountNames.put(aName, null);
-                                                profile.storeAccount(aName);
+                                                profile.storeAccount(acc);
                                             }
                                         }
 
-                                        accountList.add(lastAccount);
+                                        if (!onlyStarred || !lastAccount.isHidden())
+                                            accountList.add(lastAccount);
                                         accountNames.put(acct_name, null);
 
                                         state = ParserState.EXPECTING_ACCOUNT_AMOUNT;
@@ -347,7 +355,7 @@ public class RetrieveTransactionsTask
                         Date now = new Date();
                         profile.set_option_value(MLDB.OPT_LAST_SCRAPE, now.getTime());
                         Data.lastUpdateDate.set(now);
-                        Data.transactions.set(transactionList);
+                        TransactionListViewModel.scheduleTransactionListReload();
                     }
                     finally {
                         db.endTransaction();