From: Damyan Ivanov Date: Thu, 14 Mar 2019 20:43:04 +0000 (+0200) Subject: fix wrong showing of sub-accounts of collapsed accounts upon refresh X-Git-Tag: v0.8~14 X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=commitdiff_plain;h=31ddecc27155db9bf5f328335e55b6900c2a0030 fix wrong showing of sub-accounts of collapsed accounts upon refresh --- 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 8f1a764b..c4f55d0e 100644 --- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java +++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java @@ -172,8 +172,7 @@ public class RetrieveTransactionsTask lastAccount = profile.tryLoadAccount(db, acct_name); if (lastAccount == null) lastAccount = new LedgerAccount(acct_name); - else - lastAccount.removeAmounts(); + else lastAccount.removeAmounts(); profile.storeAccount(db, lastAccount); // make sure the parent account(s) are present, @@ -191,15 +190,16 @@ public class RetrieveTransactionsTask String aName = toAppend.pop(); LedgerAccount acc = new LedgerAccount(aName); acc.setHiddenByStar(lastAccount.isHiddenByStar()); - if (!onlyStarred || !acc.isHiddenByStar()) - accountList.add(acc); + if ((!onlyStarred || !acc.isHiddenByStar()) && + acc.isVisible(accountList)) accountList.add(acc); L(String.format("gap-filling with %s", aName)); accountNames.put(aName, null); profile.storeAccount(db, acc); } } - if (!onlyStarred || !lastAccount.isHiddenByStar()) + if ((!onlyStarred || !lastAccount.isHiddenByStar()) && + lastAccount.isVisible(accountList)) accountList.add(lastAccount); accountNames.put(acct_name, null);