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 8f1a764b386aa4db91a901fcde5688ec346dd6d6..c4f55d0e7e6114caf66151ca71f276981eb31d16 100644 (file)
--- 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);
                                     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,
                                     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());
                                             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);
                                         }
                                     }
 
                                             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);
 
                                         accountList.add(lastAccount);
                                     accountNames.put(acct_name, null);