X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FSendTransactionTask.java;h=f7370adb506528e6336a55e94e08b3e26529013c;hb=5df10dc0b58df4d4be4e9ab34f1e0f477ca46766;hp=e3675b177ba738950b27234ee98f2a0e5297375e;hpb=fa7288f7100565c67ed66b6394d79db5019a94ab;p=mobile-ledger.git

diff --git a/app/src/main/java/net/ktnx/mobileledger/async/SendTransactionTask.java b/app/src/main/java/net/ktnx/mobileledger/async/SendTransactionTask.java
index e3675b17..f7370adb 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/SendTransactionTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/SendTransactionTask.java
@@ -17,18 +17,15 @@
 
 package net.ktnx.mobileledger.async;
 
-import android.content.res.Resources;
 import android.os.AsyncTask;
 import android.util.Log;
-import android.util.SparseArray;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.ObjectWriter;
-
-import net.ktnx.mobileledger.R;
+import net.ktnx.mobileledger.db.Profile;
+import net.ktnx.mobileledger.json.API;
+import net.ktnx.mobileledger.json.ApiNotSupportedException;
+import net.ktnx.mobileledger.json.Gateway;
 import net.ktnx.mobileledger.model.LedgerTransaction;
 import net.ktnx.mobileledger.model.LedgerTransactionAccount;
-import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.utils.Globals;
 import net.ktnx.mobileledger.utils.Logger;
 import net.ktnx.mobileledger.utils.NetworkUtil;
@@ -59,57 +56,38 @@ import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void> {
     private final TaskCallback taskCallback;
+    private final Profile mProfile;
+    private final boolean simulate;
     protected String error;
     private String token;
     private String session;
     private LedgerTransaction transaction;
-    private MobileLedgerProfile mProfile;
-    private boolean simulate;
 
-    public SendTransactionTask(TaskCallback callback, MobileLedgerProfile profile,
+    public SendTransactionTask(TaskCallback callback, Profile profile,
                                boolean simulate) {
         taskCallback = callback;
         mProfile = profile;
         this.simulate = simulate;
     }
-    public SendTransactionTask(TaskCallback callback, MobileLedgerProfile profile) {
+    public SendTransactionTask(TaskCallback callback, Profile profile) {
         taskCallback = callback;
         mProfile = profile;
         simulate = false;
     }
-    private boolean send_1_15_OK() throws IOException {
-        HttpURLConnection http = NetworkUtil.prepareConnection(mProfile, "add");
-        http.setRequestMethod("PUT");
-        http.setRequestProperty("Content-Type", "application/json");
-        http.setRequestProperty("Accept", "*/*");
-
-        net.ktnx.mobileledger.json.v1_15.ParsedLedgerTransaction jsonTransaction =
-                net.ktnx.mobileledger.json.v1_15.ParsedLedgerTransaction.fromLedgerTransaction(
-                        transaction);
-        ObjectMapper mapper = new ObjectMapper();
-        ObjectWriter writer =
-                mapper.writerFor(net.ktnx.mobileledger.json.v1_15.ParsedLedgerTransaction.class);
-        String body = writer.writeValueAsString(jsonTransaction);
-
-        return sendRequest(http, body);
-    }
-    private boolean send_1_14_OK() throws IOException {
+    private void sendOK(API apiVersion) throws IOException, ApiNotSupportedException {
         HttpURLConnection http = NetworkUtil.prepareConnection(mProfile, "add");
         http.setRequestMethod("PUT");
         http.setRequestProperty("Content-Type", "application/json");
         http.setRequestProperty("Accept", "*/*");
 
-        net.ktnx.mobileledger.json.v1_14.ParsedLedgerTransaction jsonTransaction =
-                net.ktnx.mobileledger.json.v1_14.ParsedLedgerTransaction.fromLedgerTransaction(
-                        transaction);
-        ObjectMapper mapper = new ObjectMapper();
-        ObjectWriter writer =
-                mapper.writerFor(net.ktnx.mobileledger.json.v1_14.ParsedLedgerTransaction.class);
-        String body = writer.writeValueAsString(jsonTransaction);
+        Gateway gateway = Gateway.forApiVersion(apiVersion);
+        String body = gateway.transactionSaveRequest(transaction);
 
-        return sendRequest(http, body);
+        Logger.debug("network", "Sending using API " + apiVersion);
+        sendRequest(http, body);
     }
-    private boolean sendRequest(HttpURLConnection http, String body) throws IOException {
+    private void sendRequest(HttpURLConnection http, String body)
+            throws IOException, ApiNotSupportedException {
         if (simulate) {
             debug("network", "The request would be: " + body);
             try {
@@ -121,7 +99,7 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
                 Logger.debug("network", ex.toString());
             }
 
-            return true;
+            return;
         }
 
         byte[] bodyBytes = body.getBytes(StandardCharsets.UTF_8);
@@ -147,8 +125,24 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
                     case 201:
                         break;
                     case 400:
-                    case 405:
-                        return false; // will cause a retry with the legacy method
+                    case 405: {
+                        BufferedReader reader = new BufferedReader(new InputStreamReader(resp));
+                        StringBuilder errorLines = new StringBuilder();
+                        int count = 0;
+                        while (count <= 5) {
+                            String line = reader.readLine();
+                            if (line == null)
+                                break;
+                            Logger.debug("network", line);
+
+                            if (errorLines.length() != 0)
+                                errorLines.append("\n");
+
+                            errorLines.append(line);
+                            count++;
+                        }
+                        throw new ApiNotSupportedException(errorLines.toString());
+                    }
                     default:
                         BufferedReader reader = new BufferedReader(new InputStreamReader(resp));
                         String line = reader.readLine();
@@ -158,8 +152,6 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
                 }
             }
         }
-
-        return true;
     }
     private boolean legacySendOK() throws IOException {
         HttpURLConnection http = NetworkUtil.prepareConnection(mProfile, "add");
@@ -177,10 +169,9 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
         if (token != null)
             params.addPair("_token", token);
 
-        SimpleDate transactionDate = transaction.getDate();
-        if (transactionDate == null) {
+        SimpleDate transactionDate = transaction.getDateIfAny();
+        if (transactionDate == null)
             transactionDate = SimpleDate.today();
-        }
 
         params.addPair("date", Globals.formatLedgerDate(transactionDate));
         params.addPair("description", transaction.getDescription());
@@ -262,39 +253,42 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
         try {
             transaction = ledgerTransactions[0];
 
-            switch (mProfile.getApiVersion()) {
+            final API profileApiVersion = API.valueOf(mProfile.getApiVersion());
+            switch (profileApiVersion) {
                 case auto:
-                    Logger.debug("network", "Trying version 1.5.");
-                    if (!send_1_15_OK()) {
-                        Logger.debug("network", "Version 1.5 request failed. Trying with 1.14");
-                        if (!send_1_14_OK()) {
-                            Logger.debug("network",
-                                    "Version 1.14 failed too. Trying HTML form emulation");
-                            legacySendOkWithRetry();
+                    boolean sendOK = false;
+                    for (API ver : API.allVersions) {
+                        Logger.debug("network", "Trying version " + ver);
+                        try {
+                            sendOK(ver);
+                            sendOK = true;
+                            Logger.debug("network", "Version " + ver + " request succeeded");
+
+                            break;
                         }
-                        else {
-                            Logger.debug("network", "Version 1.14 request succeeded");
+                        catch (ApiNotSupportedException e) {
+                            Logger.debug("network", "Version " + ver + " seems not supported");
                         }
                     }
-                    else {
-                        Logger.debug("network", "Version 1.15 request succeeded");
+
+                    if (!sendOK) {
+                        Logger.debug("network", "Trying HTML form emulation");
+                        legacySendOkWithRetry();
                     }
                     break;
                 case html:
                     legacySendOkWithRetry();
                     break;
-                case pre_1_15:
-                    send_1_14_OK();
-                    break;
-                case post_1_14:
-                    send_1_15_OK();
+                case v1_14:
+                case v1_15:
+                case v1_19_1:
+                    sendOK(profileApiVersion);
                     break;
                 default:
-                    throw new IllegalStateException(
-                            "Unexpected API version: " + mProfile.getApiVersion());
+                    throw new IllegalStateException("Unexpected API version: " + profileApiVersion);
             }
         }
-        catch (Exception e) {
+        catch (ApiNotSupportedException | Exception e) {
             e.printStackTrace();
             error = e.getMessage();
         }
@@ -316,40 +310,4 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
         taskCallback.done(error);
     }
 
-    public enum API {
-        auto(0), html(-1), pre_1_15(-2), post_1_14(-3);
-        private static SparseArray<API> map = new SparseArray<>();
-
-        static {
-            for (API item : API.values()) {
-                map.put(item.value, item);
-            }
-        }
-
-        private int value;
-
-        API(int value) {
-            this.value = value;
-        }
-        public static API valueOf(int i) {
-            return map.get(i, auto);
-        }
-        public int toInt() {
-            return this.value;
-        }
-        public String getDescription(Resources resources) {
-            switch (this) {
-                case auto:
-                    return resources.getString(R.string.api_auto);
-                case html:
-                    return resources.getString(R.string.api_html);
-                case pre_1_15:
-                    return resources.getString(R.string.api_pre_1_15);
-                case post_1_14:
-                    return resources.getString(R.string.api_post_1_14);
-                default:
-                    throw new IllegalStateException("Unexpected value: " + value);
-            }
-        }
-    }
-}
+}
\ No newline at end of file