fix refresh mangling with account "starred" status

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / async / RetrieveTransactionsTask.java

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 5f241f4fd5985ee2954f4ecab2ecd8e62423f81f..4e2c6108f5d1eb79f74d8898b8b25899d8f2fdf5 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -52,8 +52,8 @@ import java.util.regex.Pattern;
 
 public class RetrieveTransactionsTask
         extends AsyncTask<Void, RetrieveTransactionsTask.Progress, Void> {
-    public static final int MATCHING_TRANSACTIONS_LIMIT = 50;
-    public static final Pattern commentPattern = Pattern.compile("^\\s*;");
+    private static final int MATCHING_TRANSACTIONS_LIMIT = 50;
+    private static final Pattern commentPattern = Pattern.compile("^\\s*;");
     private static final Pattern transactionStartPattern = Pattern.compile("<tr class=\"title\" " +
                                                                            "id=\"transaction-(\\d+)\"><td class=\"date\"[^\"]*>([\\d.-]+)</td>");
     private static final Pattern transactionDescriptionPattern =
@@ -61,20 +61,17 @@ public class RetrieveTransactionsTask
     private static final Pattern transactionDetailsPattern =
             Pattern.compile("^\\s+(\\S[\\S\\s]+\\S)\\s\\s+([-+]?\\d[\\d,.]*)(?:\\s+(\\S+)$)?");
     private static final Pattern endPattern = Pattern.compile("\\bid=\"addmodal\"");
-    protected WeakReference<MainActivity> contextRef;
-    protected int error;
-    Pattern account_name_re = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
-    Pattern account_value_re = Pattern.compile(
-            "<span class=\"[^\"]*\\bamount\\b[^\"]*\">\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?</span>");
-    Pattern tr_end_re = Pattern.compile("</tr>");
-    Pattern descriptions_line_re = Pattern.compile("\\bdescriptionsSuggester\\s*=\\s*new\\b");
-    Pattern description_items_re = Pattern.compile("\"value\":\"([^\"]+)\"");
+    private WeakReference<MainActivity> contextRef;
+    private int error;
     // %3A is '='
     private boolean success;
+    private Pattern account_name_re = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
+    private Pattern account_value_re = Pattern.compile(
+            "<span class=\"[^\"]*\\bamount\\b[^\"]*\">\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?</span>");
     public RetrieveTransactionsTask(WeakReference<MainActivity> contextRef) {
         this.contextRef = contextRef;
     }
-    private static final void L(String msg) {
+    private static void L(String msg) {
         Log.d("transaction-parser", msg);
     }
     @Override
@@ -116,6 +113,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");
@@ -129,8 +127,6 @@ public class RetrieveTransactionsTask
                             String.format("HTTP error %d", http.getResponseCode()));
                     db.beginTransaction();
                     try {
-                        String ledgerTitle = null;
-
                         db.execSQL("UPDATE transactions set keep=0");
                         db.execSQL("update account_values set keep=0;");
                         db.execSQL("update accounts set keep=0;");
@@ -170,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
@@ -187,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;