X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FRetrieveTransactionsTask.java;h=7b1b4504300c9656b083b0a21ae09a9cc7a0d014;hb=1fe7c92ffb82a8d6e4dd354154c46b26d8afe48b;hp=8b795ac1296ab703a74918a3a53393ba7418882f;hpb=5df10dc0b58df4d4be4e9ab34f1e0f477ca46766;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 8b795ac1..7b1b4504 100644
--- 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;
@@ -408,21 +406,20 @@ public class RetrieveTransactionsTask extends
         }
     }
     private List<LedgerAccount> retrieveAccountListAnyVersion()
-            throws HTTPException, ApiNotSupportedException {
+            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);
             }
 
-            throw new ApiNotSupportedException();
         }
 
-        throw new RuntimeException("This should never be reached");
+        throw new ApiNotSupportedException();
     }
     private List<LedgerAccount> retrieveAccountListForVersion(API version)
             throws IOException, HTTPException {
@@ -437,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();
@@ -483,16 +479,15 @@ public class RetrieveTransactionsTask extends
             try {
                 return retrieveTransactionListForVersion(ver);
             }
-            catch (Exception | HTTPException e) {
+            catch (Exception e) {
                 Logger.debug("json",
                         String.format(Locale.US, "Error during account list retrieval using API %s",
                                 ver.getDescription()));
             }
 
-            throw new ApiNotSupportedException();
         }
 
-        throw new RuntimeException("This should never be reached");
+        throw new ApiNotSupportedException();
     }
     private List<LedgerTransaction> retrieveTransactionListForVersion(API apiVersion)
             throws IOException, ParseException, HTTPException {
@@ -590,8 +585,8 @@ public class RetrieveTransactionsTask extends
         }
         catch (HTTPException e) {
             e.printStackTrace();
-            return new Result(String.format("HTTP error %d: %s", e.getResponseCode(),
-                    e.getResponseMessage()));
+            return new Result(
+                    String.format("HTTP error %d: %s", e.getResponseCode(), e.getMessage()));
         }
         catch (IOException e) {
             e.printStackTrace();
@@ -663,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() {