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=ad0641216b68b28cbb98292d04b1a082df2cec7b;hp=601e7eca3c5740cedc1bd4e9100de9c83b326bdc;hb=bb21e22f7b251a22cc830358e9f2c1d2911965c4;hpb=e297bc15e35d5b10c0c2971e18cef7e439ff5f0a

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 601e7eca..ad064121 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -30,7 +30,6 @@ import net.ktnx.mobileledger.model.LedgerAccount;
 import net.ktnx.mobileledger.model.LedgerTransaction;
 import net.ktnx.mobileledger.model.LedgerTransactionAccount;
 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;
 
@@ -51,6 +50,7 @@ import java.util.regex.Pattern;
 
 public class RetrieveTransactionsTask extends
         AsyncTask<RetrieveTransactionsTask.Params, RetrieveTransactionsTask.Progress, Void> {
+    public static final int MATCHING_TRANSACTIONS_LIMIT = 50;
     private static final Pattern transactionStartPattern = Pattern.compile("<tr class=\"title\" " +
                                                                            "id=\"transaction-(\\d+)\"><td class=\"date\"[^\\\"]*>([\\d.-]+)</td>");
     private static final Pattern transactionDescriptionPattern =
@@ -61,6 +61,7 @@ public class RetrieveTransactionsTask extends
     protected WeakReference<MainActivity> contextRef;
     protected int error;
     // %3A is '='
+    private Pattern ledger_title_re = Pattern.compile("<h1>([^<]+)</h1>");
     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>");
@@ -109,6 +110,7 @@ public class RetrieveTransactionsTask extends
         int maxTransactionId = Progress.INDETERMINATE;
         success = false;
         ArrayList<LedgerAccount> accountList = new ArrayList<>();
+        ArrayList<LedgerTransaction> transactionList = new ArrayList<>();
         LedgerAccount lastAccount = null;
         Data.backgroundTaskCount.incrementAndGet();
         try {
@@ -124,6 +126,8 @@ public class RetrieveTransactionsTask extends
                             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;");
@@ -164,6 +168,13 @@ public class RetrieveTransactionsTask extends
                                         state = ParserState.EXPECTING_ACCOUNT_AMOUNT;
                                         L("→ expecting account amount");
                                     }
+                                    else if (ledgerTitle == null) {
+                                        m = ledger_title_re.matcher(line);
+                                        if (m.find()) {
+                                            ledgerTitle = m.group(1);
+                                            Data.ledgerTitle.set(ledgerTitle);
+                                        }
+                                    }
                                     break;
 
                                 case EXPECTING_ACCOUNT_AMOUNT:
@@ -180,8 +191,7 @@ public class RetrieveTransactionsTask extends
                                         L("curr=" + currency + ", value=" + value);
                                         db.execSQL(
                                                 "insert or replace into account_values(account, currency, value, keep) values(?, ?, ?, 1);",
-                                                new Object[]{lastAccount.getName(),
-                                                             currency,
+                                                new Object[]{lastAccount.getName(), currency,
                                                              Float.valueOf(value)
                                                 });
                                         lastAccount.addAmount(Float.parseFloat(value), currency);
@@ -246,7 +256,9 @@ public class RetrieveTransactionsTask extends
                                                        "=?", new Integer[]{transaction.getId()});
                                             matchedTransactionsCount++;
 
-                                            if (matchedTransactionsCount == 100) {
+                                            if (matchedTransactionsCount ==
+                                                MATCHING_TRANSACTIONS_LIMIT)
+                                            {
                                                 db.execSQL("UPDATE transactions SET keep=1 WHERE " +
                                                            "id < ?",
                                                         new Integer[]{transaction.getId()});
@@ -271,6 +283,7 @@ public class RetrieveTransactionsTask extends
                                         L(String.format(
                                                 "transaction %s saved → expecting transaction",
                                                 transaction.getId()));
+                                        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
@@ -299,7 +312,8 @@ public class RetrieveTransactionsTask extends
                                     break;
                                 default:
                                     throw new RuntimeException(
-                                            String.format("Unknown parser updating %s", state.name()));
+                                            String.format("Unknown parser updating %s",
+                                                    state.name()));
                             }
                         }
 
@@ -307,18 +321,18 @@ public class RetrieveTransactionsTask extends
 
                         db.execSQL("DELETE FROM transactions WHERE keep = 0");
                         db.setTransactionSuccessful();
+
+                        Log.d("db", "Updating transaction value stamp");
+                        Date now = new Date();
+                        MLDB.set_option_value(MLDB.OPT_TRANSACTION_LIST_STAMP, now.getTime());
+                        Data.lastUpdateDate.set(now);
+                        Data.transactions.set(transactionList);
                     }
                     finally {
                         db.endTransaction();
                     }
                 }
             }
-
-            if (success && !isCancelled()) {
-                Log.d("db", "Updating transaction value stamp");
-                MLDB.set_option_value(MLDB.OPT_TRANSACTION_LIST_STAMP, new Date().getTime());
-                TransactionListViewModel.scheduleTransactionListReload(ctx);
-            }
         }
         catch (MalformedURLException e) {
             error = R.string.err_bad_backend_url;
@@ -332,6 +346,10 @@ public class RetrieveTransactionsTask extends
             error = R.string.err_net_io_error;
             e.printStackTrace();
         }
+        catch (OperationCanceledException e) {
+            error = R.string.err_cancelled;
+            e.printStackTrace();
+        }
         finally {
             Data.backgroundTaskCount.decrementAndGet();
         }