drop remnants of gradual transaction data loading, and last non-Room SQL

[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 8ac793663eb686ccc00d428db93b965ef8c4a2f8..7b1b4504300c9656b083b0a21ae09a9cc7a0d014 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -18,16 +18,15 @@
 package net.ktnx.mobileledger.async;
 
 import android.annotation.SuppressLint;
-import android.database.sqlite.SQLiteDatabase;
 import android.os.AsyncTask;
 import android.os.OperationCanceledException;
 
 import androidx.annotation.NonNull;
 import androidx.room.Transaction;
 
+import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.RuntimeJsonMappingException;
 
-import net.ktnx.mobileledger.App;
 import net.ktnx.mobileledger.dao.AccountDAO;
 import net.ktnx.mobileledger.dao.AccountValueDAO;
 import net.ktnx.mobileledger.dao.TransactionAccountDAO;
@@ -50,7 +49,6 @@ import net.ktnx.mobileledger.model.LedgerTransaction;
 import net.ktnx.mobileledger.model.LedgerTransactionAccount;
 import net.ktnx.mobileledger.ui.MainModel;
 import net.ktnx.mobileledger.utils.Logger;
-import net.ktnx.mobileledger.utils.MLDB;
 import net.ktnx.mobileledger.utils.NetworkUtil;
 
 import java.io.BufferedReader;
@@ -407,15 +405,16 @@ public class RetrieveTransactionsTask extends
             return retrieveAccountListForVersion(apiVersion);
         }
     }
-    private List<LedgerAccount> retrieveAccountListAnyVersion() throws ApiNotSupportedException {
+    private List<LedgerAccount> retrieveAccountListAnyVersion()
+            throws ApiNotSupportedException, IOException, HTTPException {
         for (API ver : API.allVersions) {
             try {
                 return retrieveAccountListForVersion(ver);
             }
-            catch (Exception e) {
+            catch (JsonParseException | RuntimeJsonMappingException e) {
                 Logger.debug("json",
                         String.format(Locale.US, "Error during account list retrieval using API %s",
-                                ver.getDescription()));
+                                ver.getDescription()), e);
             }
 
         }
@@ -435,7 +434,6 @@ public class RetrieveTransactionsTask extends
                 throw new HTTPException(http.getResponseCode(), http.getResponseMessage());
         }
         publishProgress(Progress.indeterminate());
-        SQLiteDatabase db = App.getDatabase();
         ArrayList<LedgerAccount> list = new ArrayList<>();
         HashMap<String, LedgerAccount> map = new HashMap<>();
         throwIfCancelled();
@@ -660,7 +658,7 @@ public class RetrieveTransactionsTask extends
 
         DB.get()
           .getOptionDAO()
-          .insertSync(new Option(profile.getId(), MLDB.OPT_LAST_SCRAPE,
+          .insertSync(new Option(profile.getId(), Option.OPT_LAST_SCRAPE,
                   String.valueOf((new Date()).getTime())));
     }
     public void throwIfCancelled() {