From: Damyan Ivanov <dam+mobileledger@ktnx.net>
Date: Thu, 7 Mar 2019 03:56:50 +0000 (+0200)
Subject: handle async cancellation in JSON parsing code
X-Git-Tag: v0.8~34
X-Git-Url: https://git.ktnx.net/?a=commitdiff_plain;h=9020bea97b9666c71964b48cfcad11c966edb0e0;p=mobile-ledger.git

handle async cancellation in JSON parsing code
---

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 ab0ab271..965c1f98 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -374,6 +374,7 @@ public class RetrieveTransactionsTask
                     AccountListParser parser = new AccountListParser(resp);
 
                     while (true) {
+                        throwIfCancelled();
                         ParsedLedgerAccount parsedAccount = parser.nextAccount();
                         if (parsedAccount == null) break;
 
@@ -384,8 +385,10 @@ public class RetrieveTransactionsTask
                                     b.getAquantity().asFloat());
                         }
                     }
+                    throwIfCancelled();
 
                     profile.deleteNotPresentAccounts(db);
+                    throwIfCancelled();
                     db.setTransactionSuccessful();
                 }
                 finally {
@@ -408,6 +411,7 @@ public class RetrieveTransactionsTask
             try (InputStream resp = http.getInputStream()) {
                 if (http.getResponseCode() != 200)
                     throw new IOException(String.format("HTTP error %d", http.getResponseCode()));
+                throwIfCancelled();
                 db.beginTransaction();
                 try {
                     profile.markTransactionsAsNotPresent(db);
@@ -418,7 +422,9 @@ public class RetrieveTransactionsTask
                     int processedTransactionCount = 0;
 
                     while (true) {
+                        throwIfCancelled();
                         ParsedLedgerTransaction parsedTransaction = parser.nextTransaction();
+                        throwIfCancelled();
                         if (parsedTransaction == null) break;
                         LedgerTransaction transaction = parsedTransaction.asLedgerTransaction();
                         if (transaction.existsInDb(db)) {
@@ -444,7 +450,9 @@ public class RetrieveTransactionsTask
                         publishProgress(progress);
                     }
 
+                    throwIfCancelled();
                     profile.deleteNotPresentTransactions(db);
+                    throwIfCancelled();
                     db.setTransactionSuccessful();
                     profile.setLastUpdateStamp();
                 }