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=4e2c6108f5d1eb79f74d8898b8b25899d8f2fdf5;hp=f4d246a66a80f19e02fa388578b11a8ffa94d901;hb=2fe366bc4f382a35ef1379a158a6131ca89bdb9e;hpb=b19d307424598019385bb9b65405e45ffe65cde1 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..4e2c6108 100644 --- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java +++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java @@ -113,6 +113,7 @@ public class RetrieveTransactionsTask ArrayList transactionList = new ArrayList<>(); HashMap accountNames = new HashMap<>(); LedgerAccount lastAccount = null; + boolean onlyStarred = Data.optShowOnlyStarred.get(); Data.backgroundTaskCount.incrementAndGet(); try { HttpURLConnection http = NetworkUtil.prepare_connection("journal"); @@ -165,8 +166,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 +186,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;