assume that no more changed transactions will be discovered after 50 matching transac...

[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 f0a7e0e6f0152b3f2c2291b4dd10bda8d79959ac..c5850512920312992243bff315ab379cef89e231 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -45,13 +45,13 @@ import java.net.MalformedURLException;
 import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 import java.util.regex.Matcher;
 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 =
@@ -109,7 +109,7 @@ public class RetrieveTransactionsTask extends
         Progress progress = new Progress();
         int maxTransactionId = Progress.INDETERMINATE;
         success = false;
-        List<LedgerAccount> accountList = new ArrayList<>();
+        ArrayList<LedgerAccount> accountList = new ArrayList<>();
         LedgerAccount lastAccount = null;
         Data.backgroundTaskCount.incrementAndGet();
         try {
@@ -247,7 +247,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()});
@@ -303,10 +305,11 @@ public class RetrieveTransactionsTask extends
                                             String.format("Unknown parser updating %s", state.name()));
                             }
                         }
-                        if (!isCancelled()) {
-                            db.execSQL("DELETE FROM transactions WHERE keep = 0");
-                            db.setTransactionSuccessful();
-                        }
+
+                        throwIfCancelled();
+
+                        db.execSQL("DELETE FROM transactions WHERE keep = 0");
+                        db.setTransactionSuccessful();
                     }
                     finally {
                         db.endTransaction();