X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FRetrieveTransactionsTask.java;h=601e7eca3c5740cedc1bd4e9100de9c83b326bdc;hb=e297bc15e35d5b10c0c2971e18cef7e439ff5f0a;hp=7f4246cf6e892b57cc2c29bc48a44b10013e4686;hpb=a1d55154e1c9fb72fcd60de31d6e64e8d046f96d;p=mobile-ledger.git

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 7f4246cf..601e7eca 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -45,7 +45,6 @@ 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;
 
@@ -109,7 +108,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 {
@@ -303,10 +302,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();
@@ -317,7 +317,7 @@ public class RetrieveTransactionsTask extends
             if (success && !isCancelled()) {
                 Log.d("db", "Updating transaction value stamp");
                 MLDB.set_option_value(MLDB.OPT_TRANSACTION_LIST_STAMP, new Date().getTime());
-                ((TransactionListViewModel)ctx.currentFragment.model).scheduleTransactionListReload(ctx);
+                TransactionListViewModel.scheduleTransactionListReload(ctx);
             }
         }
         catch (MalformedURLException e) {