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=4da02e823111a070efa473edcbdf8c82ab8521b3;hp=4e2c6108f5d1eb79f74d8898b8b25899d8f2fdf5;hb=e0b2d33c159281741f3a6e30975d58040a8ab879;hpb=2fe366bc4f382a35ef1379a158a6131ca89bdb9e

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 4e2c6108..4da02e82 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;
 
@@ -53,20 +54,20 @@ import java.util.regex.Pattern;
 public class RetrieveTransactionsTask
         extends AsyncTask<Void, RetrieveTransactionsTask.Progress, Void> {
     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 =
+    private static final Pattern reComment = Pattern.compile("^\\s*;");
+    private static final Pattern reTransactionStart = Pattern.compile("<tr class=\"title\" " +
+                                                                      "id=\"transaction-(\\d+)\"><td class=\"date\"[^\"]*>([\\d.-]+)</td>");
+    private static final Pattern reTransactionDescription =
             Pattern.compile("<tr class=\"posting\" title=\"(\\S+)\\s(.+)");
-    private static final Pattern transactionDetailsPattern =
+    private static final Pattern reTransactionDetails =
             Pattern.compile("^\\s+(\\S[\\S\\s]+\\S)\\s\\s+([-+]?\\d[\\d,.]*)(?:\\s+(\\S+)$)?");
-    private static final Pattern endPattern = Pattern.compile("\\bid=\"addmodal\"");
+    private static final Pattern reEnd = Pattern.compile("\\bid=\"addmodal\"");
     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(
+    private Pattern reAccountName = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
+    private Pattern reAccountValue = Pattern.compile(
             "<span class=\"[^\"]*\\bamount\\b[^\"]*\">\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?</span>");
     public RetrieveTransactionsTask(WeakReference<MainActivity> contextRef) {
         this.contextRef = contextRef;
@@ -110,13 +111,12 @@ public class RetrieveTransactionsTask
         int maxTransactionId = Progress.INDETERMINATE;
         success = false;
         ArrayList<LedgerAccount> accountList = new ArrayList<>();
-        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");
+            HttpURLConnection http = NetworkUtil.prepareConnection("journal");
             http.setAllowUserInteraction(false);
             publishProgress(progress);
             MainActivity ctx = getContext();
@@ -144,7 +144,7 @@ public class RetrieveTransactionsTask
                         while ((line = buf.readLine()) != null) {
                             throwIfCancelled();
                             Matcher m;
-                            m = commentPattern.matcher(line);
+                            m = reComment.matcher(line);
                             if (m.find()) {
                                 // TODO: comments are ignored for now
                                 Log.v("transaction-parser", "Ignoring comment");
@@ -159,7 +159,7 @@ public class RetrieveTransactionsTask
                                         Data.accounts.set(accountList);
                                         continue;
                                     }
-                                    m = account_name_re.matcher(line);
+                                    m = reAccountName.matcher(line);
                                     if (m.find()) {
                                         String acct_encoded = m.group(1);
                                         String acct_name = URLDecoder.decode(acct_encoded, "UTF-8");
@@ -205,7 +205,7 @@ public class RetrieveTransactionsTask
                                     break;
 
                                 case EXPECTING_ACCOUNT_AMOUNT:
-                                    m = account_value_re.matcher(line);
+                                    m = reAccountValue.matcher(line);
                                     boolean match_found = false;
                                     while (m.find()) {
                                         throwIfCancelled();
@@ -230,7 +230,7 @@ public class RetrieveTransactionsTask
 
                                 case EXPECTING_TRANSACTION:
                                     if (!line.isEmpty() && (line.charAt(0) == ' ')) continue;
-                                    m = transactionStartPattern.matcher(line);
+                                    m = reTransactionStart.matcher(line);
                                     if (m.find()) {
                                         transactionId = Integer.valueOf(m.group(1));
                                         state = ParserState.EXPECTING_TRANSACTION_DESCRIPTION;
@@ -245,7 +245,7 @@ public class RetrieveTransactionsTask
                                             progress.setTotal(transactionId);
                                         publishProgress(progress);
                                     }
-                                    m = endPattern.matcher(line);
+                                    m = reEnd.matcher(line);
                                     if (m.find()) {
                                         L("--- transaction value complete ---");
                                         success = true;
@@ -255,7 +255,7 @@ public class RetrieveTransactionsTask
 
                                 case EXPECTING_TRANSACTION_DESCRIPTION:
                                     if (!line.isEmpty() && (line.charAt(0) == ' ')) continue;
-                                    m = transactionDescriptionPattern.matcher(line);
+                                    m = reTransactionDescription.matcher(line);
                                     if (m.find()) {
                                         if (transactionId == 0)
                                             throw new TransactionParserException(
@@ -308,7 +308,6 @@ public class RetrieveTransactionsTask
                                                 "transaction %s saved → expecting transaction",
                                                 transaction.getId()));
                                         transaction.finishLoading();
-                                        transactionList.add(transaction);
 
 // sounds like a good idea, but transaction-1 may not be the first one chronologically
 // for example, when you add the initial seeding transaction after entering some others
@@ -319,7 +318,7 @@ public class RetrieveTransactionsTask
 //                                            }
                                     }
                                     else {
-                                        m = transactionDetailsPattern.matcher(line);
+                                        m = reTransactionDetails.matcher(line);
                                         if (m.find()) {
                                             String acc_name = m.group(1);
                                             String amount = m.group(2);
@@ -352,9 +351,9 @@ public class RetrieveTransactionsTask
 
                         Log.d("db", "Updating transaction value stamp");
                         Date now = new Date();
-                        profile.set_option_value(MLDB.OPT_LAST_SCRAPE, now.getTime());
+                        profile.setLongOption(MLDB.OPT_LAST_SCRAPE, now.getTime());
                         Data.lastUpdateDate.set(now);
-                        Data.transactions.set(transactionList);
+                        TransactionListViewModel.scheduleTransactionListReload();
                     }
                     finally {
                         db.endTransaction();