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=965c1f982fc98db94458dfb1109d9e4eabd07c67;hp=35277d6749e5f048c77f6ff62c78b1b0b1d465e3;hb=9020bea97b9666c71964b48cfcad11c966edb0e0;hpb=d295c5e74a18fed6383109ec463bc6c3f6b48fce 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 35277d67..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)) { @@ -430,6 +436,7 @@ public class RetrieveTransactionsTask progress.setTotal(progress.getProgress()); publishProgress(progress); db.setTransactionSuccessful(); + profile.setLastUpdateStamp(); return true; } } @@ -443,8 +450,11 @@ public class RetrieveTransactionsTask publishProgress(progress); } + throwIfCancelled(); profile.deleteNotPresentTransactions(db); + throwIfCancelled(); db.setTransactionSuccessful(); + profile.setLastUpdateStamp(); } finally { db.endTransaction();