X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FSendTransactionTask.java;h=5170b9337a362dbcafc55cd6e66360056521157a;hp=fa69f86c593fbacaa65de813d457a2eaa5db056d;hb=54002a662d97289a739d3cdb9888bbab58a8064f;hpb=b18cd774a08afb15f9c3b953508b4823211c547b

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 fa69f86c..5170b933 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/SendTransactionTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/SendTransactionTask.java
@@ -17,17 +17,20 @@
 
 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.json.ParsedLedgerTransaction;
-import net.ktnx.mobileledger.model.Data;
+import net.ktnx.mobileledger.R;
 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;
 import net.ktnx.mobileledger.utils.UrlEncodedFormData;
 
@@ -38,6 +41,8 @@ import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.nio.charset.StandardCharsets;
+import java.util.Date;
+import java.util.GregorianCalendar;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -45,6 +50,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import static android.os.SystemClock.sleep;
+import static net.ktnx.mobileledger.utils.Logger.debug;
 
 public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void> {
     private final TaskCallback taskCallback;
@@ -52,35 +58,79 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
     private String token;
     private String session;
     private LedgerTransaction ltr;
+    private MobileLedgerProfile mProfile;
+    private boolean simulate = false;
 
-    public SendTransactionTask(TaskCallback callback) {
+    public SendTransactionTask(TaskCallback callback, MobileLedgerProfile profile,
+                               boolean simulate) {
         taskCallback = callback;
+        mProfile = profile;
+        this.simulate = simulate;
     }
-    private boolean sendOK() throws IOException {
-        HttpURLConnection http = NetworkUtil.prepareConnection(Data.profile.get(), "add");
+    public SendTransactionTask(TaskCallback callback, MobileLedgerProfile 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", "*/*");
 
-        ParsedLedgerTransaction jsonTransaction;
-        jsonTransaction = ltr.toParsedLedgerTransaction();
+        net.ktnx.mobileledger.json.v1_15.ParsedLedgerTransaction jsonTransaction =
+                net.ktnx.mobileledger.json.v1_15.ParsedLedgerTransaction.fromLedgerTransaction(ltr);
         ObjectMapper mapper = new ObjectMapper();
-        ObjectWriter writer = mapper.writerFor(ParsedLedgerTransaction.class);
+        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 {
+        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(ltr);
+        ObjectMapper mapper = new ObjectMapper();
+        ObjectWriter writer =
+                mapper.writerFor(net.ktnx.mobileledger.json.v1_14.ParsedLedgerTransaction.class);
+        String body = writer.writeValueAsString(jsonTransaction);
+
+        return sendRequest(http, body);
+    }
+    private boolean sendRequest(HttpURLConnection http, String body) throws IOException {
+        if (simulate) {
+            debug("network", "The request would be: " + body);
+            try {
+                Thread.sleep(1500);
+                if (Math.random() > 0.3)
+                    throw new RuntimeException("Simulated test exception");
+            }
+            catch (InterruptedException ex) {
+                Logger.debug("network", ex.toString());
+            }
+
+            return true;
+        }
+
         byte[] bodyBytes = body.getBytes(StandardCharsets.UTF_8);
         http.setDoOutput(true);
         http.setDoInput(true);
         http.addRequestProperty("Content-Length", String.valueOf(bodyBytes.length));
 
-        Log.d("network", "request header: " + http.getRequestProperties().toString());
+        debug("network", "request header: " + http.getRequestProperties()
+                                                  .toString());
 
         try (OutputStream req = http.getOutputStream()) {
-            Log.d("network", "Request body: " + body);
+            debug("network", "Request body: " + body);
             req.write(bodyBytes);
 
             final int responseCode = http.getResponseCode();
-            Log.d("network",
+            debug("network",
                     String.format("Response: %d %s", responseCode, http.getResponseMessage()));
 
             try (InputStream resp = http.getErrorStream()) {
@@ -89,12 +139,13 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
                     case 200:
                     case 201:
                         break;
+                    case 400:
                     case 405:
                         return false; // will cause a retry with the legacy method
                     default:
                         BufferedReader reader = new BufferedReader(new InputStreamReader(resp));
                         String line = reader.readLine();
-                        Log.d("network", "Response content: " + line);
+                        debug("network", "Response content: " + line);
                         throw new IOException(
                                 String.format("Error response code %d", responseCode));
                 }
@@ -104,7 +155,7 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
         return true;
     }
     private boolean legacySendOK() throws IOException {
-        HttpURLConnection http = NetworkUtil.prepareConnection(Data.profile.get(), "add");
+        HttpURLConnection http = NetworkUtil.prepareConnection(mProfile, "add");
         http.setRequestMethod("POST");
         http.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
         http.setRequestProperty("Accept", "*/*");
@@ -116,27 +167,36 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
 
         UrlEncodedFormData params = new UrlEncodedFormData();
         params.addPair("_formid", "identify-add");
-        if (token != null) params.addPair("_token", token);
-        params.addPair("date", Globals.formatLedgerDate(ltr.getDate()));
+        if (token != null)
+            params.addPair("_token", token);
+
+        Date transactionDate = ltr.getDate();
+        if (transactionDate == null) {
+            transactionDate = new GregorianCalendar().getTime();
+        }
+
+        params.addPair("date", Globals.formatLedgerDate(transactionDate));
         params.addPair("description", ltr.getDescription());
         for (LedgerTransactionAccount acc : ltr.getAccounts()) {
             params.addPair("account", acc.getAccountName());
             if (acc.isAmountSet())
                 params.addPair("amount", String.format(Locale.US, "%1.2f", acc.getAmount()));
-            else params.addPair("amount", "");
+            else
+                params.addPair("amount", "");
         }
 
         String body = params.toString();
         http.addRequestProperty("Content-Length", String.valueOf(body.length()));
 
-        Log.d("network", "request header: " + http.getRequestProperties().toString());
+        debug("network", "request header: " + http.getRequestProperties()
+                                                  .toString());
 
         try (OutputStream req = http.getOutputStream()) {
-            Log.d("network", "Request body: " + body);
+            debug("network", "Request body: " + body);
             req.write(body.getBytes(StandardCharsets.US_ASCII));
 
             try (InputStream resp = http.getInputStream()) {
-                Log.d("update_accounts", String.valueOf(http.getResponseCode()));
+                debug("update_accounts", String.valueOf(http.getResponseCode()));
                 if (http.getResponseCode() == 303) {
                     // everything is fine
                     return true;
@@ -153,10 +213,10 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
                             Matcher m = reSessionCookie.matcher(cookie);
                             if (m.matches()) {
                                 session = m.group(1);
-                                Log.d("network", "new session is " + session);
+                                debug("network", "new session is " + session);
                             }
                             else {
-                                Log.d("network", "set-cookie: " + cookie);
+                                debug("network", "set-cookie: " + cookie);
                                 Log.w("network",
                                         "Response Set-Cookie headers is not a _SESSION one");
                             }
@@ -171,12 +231,12 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
                             "<input type=\"hidden\" name=\"_token\" value=\"([^\"]+)\">");
                     String line;
                     while ((line = reader.readLine()) != null) {
-                        //Log.d("dump", line);
+                        //debug("dump", line);
                         Matcher m = re.matcher(line);
                         if (m.matches()) {
                             token = m.group(1);
-                            Log.d("save-transaction", line);
-                            Log.d("save-transaction", "Token=" + token);
+                            debug("save-transaction", line);
+                            debug("save-transaction", "Token=" + token);
                             return false;       // retry
                         }
                     }
@@ -189,21 +249,41 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
             }
         }
     }
-
     @Override
     protected Void doInBackground(LedgerTransaction... ledgerTransactions) {
         error = null;
         try {
             ltr = ledgerTransactions[0];
 
-            if (!sendOK()) {
-                int tried = 0;
-                while (!legacySendOK()) {
-                        tried++;
-                        if (tried >= 2)
-                            throw new IOException(String.format("aborting after %d tries", tried));
-                        sleep(100);
-                }
+            switch (mProfile.getApiVersion()) {
+                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();
+                        }
+                        else {
+                            Logger.debug("network", "Version 1.14 request succeeded");
+                        }
+                    }
+                    else {
+                        Logger.debug("network", "Version 1.15 request succeeded");
+                    }
+                    break;
+                case html:
+                    legacySendOkWithRetry();
+                    break;
+                case pre_1_15:
+                    send_1_14_OK();
+                    break;
+                case post_1_14:
+                    send_1_15_OK();
+                    break;
+                default:
+                    throw new IllegalStateException(
+                            "Unexpected API version: " + mProfile.getApiVersion());
             }
         }
         catch (Exception e) {
@@ -213,10 +293,56 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
 
         return null;
     }
-
+    private void legacySendOkWithRetry() throws IOException {
+        int tried = 0;
+        while (!legacySendOK()) {
+            tried++;
+            if (tried >= 2)
+                throw new IOException(
+                        String.format("aborting after %d tries", tried));
+            sleep(100);
+        }
+    }
     @Override
     protected void onPostExecute(Void aVoid) {
         super.onPostExecute(aVoid);
         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);
+            }
+        }
+    }
 }