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=0fd4a1b50fc284660d7663197d737f72af330404;hp=2e8d9531931e7eef501dc0dedbe16cf76f207747;hb=217da55a224e2ae899d0b50604e2e54f882ec04f;hpb=506b101c61d4bfc2bb42501ad5fbf1453012294d

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 2e8d9531..0fd4a1b5 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/SendTransactionTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/SendTransactionTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2019 Damyan Ivanov.
+ * Copyright © 2020 Damyan Ivanov.
  * This file is part of MoLe.
  * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
@@ -17,18 +17,22 @@
 
 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.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.SimpleDate;
 import net.ktnx.mobileledger.utils.UrlEncodedFormData;
 
 import java.io.BufferedReader;
@@ -47,6 +51,12 @@ import java.util.regex.Pattern;
 import static android.os.SystemClock.sleep;
 import static net.ktnx.mobileledger.utils.Logger.debug;
 
+/* TODO: get rid of the custom session/cookie and auth code?
+ *       (the last problem with the POST was the missing content-length header)
+ *       This will resolve itself when hledger-web 1.14+ is released with Debian/stable,
+ *       at which point the HTML form emulation can be dropped entirely
+ */
+
 public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void> {
     private final TaskCallback taskCallback;
     protected String error;
@@ -54,36 +64,64 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
     private String session;
     private LedgerTransaction ltr;
     private MobileLedgerProfile mProfile;
+    private boolean simulate = false;
 
+    public SendTransactionTask(TaskCallback callback, MobileLedgerProfile profile,
+                               boolean simulate) {
+        taskCallback = callback;
+        mProfile = profile;
+        this.simulate = simulate;
+    }
     public SendTransactionTask(TaskCallback callback, MobileLedgerProfile profile) {
         taskCallback = callback;
         mProfile = profile;
+        simulate = false;
     }
-    private boolean sendOK() throws IOException {
-//        if (BuildConfig.DEBUG) {
-//        TODO: simulate random problems
-//
-//            try {
-//                Thread.sleep(1500);
-//            }
-//            catch (InterruptedException ex) {
-//                Logger.debug("network", ex.toString());
-//            }
-//
-//            return true;
-//        }
+    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(ltr);
+        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 {
         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_14.ParsedLedgerTransaction jsonTransaction =
+                net.ktnx.mobileledger.json.v1_14.ParsedLedgerTransaction.fromLedgerTransaction(ltr);
         ObjectMapper mapper = new ObjectMapper();
-        ObjectWriter writer = mapper.writerFor(ParsedLedgerTransaction.class);
+        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);
@@ -106,6 +144,7 @@ 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:
@@ -135,7 +174,13 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
         params.addPair("_formid", "identify-add");
         if (token != null)
             params.addPair("_token", token);
-        params.addPair("date", Globals.formatLedgerDate(ltr.getDate()));
+
+        SimpleDate transactionDate = ltr.getDate();
+        if (transactionDate == null) {
+            transactionDate = SimpleDate.today();
+        }
+
+        params.addPair("date", Globals.formatLedgerDate(transactionDate));
         params.addPair("description", ltr.getDescription());
         for (LedgerTransactionAccount acc : ltr.getAccounts()) {
             params.addPair("account", acc.getAccountName());
@@ -209,21 +254,42 @@ 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) {
@@ -233,10 +299,55 @@ 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);
+            }
+        }
+    }
 }