X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FSendTransactionTask.java;h=dc0c24875469a74b5d6404097a21034d1690672a;hb=bb789332571609eeb1bef6e39b7ad359227d1045;hp=cfbf5222c30a24ff41c9c1282a664da17e61a46e;hpb=4c2d1b2095d022074deed016e95cd3cca3b9f624;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 cfbf5222..dc0c2487 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
@@ -23,13 +23,13 @@ import android.util.Log;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 
-import net.ktnx.mobileledger.json.ParsedLedgerTransaction;
 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;
@@ -39,8 +39,6 @@ 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;
@@ -50,14 +48,20 @@ 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;
+    private final MobileLedgerProfile mProfile;
+    private final boolean simulate;
     protected String error;
     private String token;
     private String session;
-    private LedgerTransaction ltr;
-    private MobileLedgerProfile mProfile;
-    private boolean simulate = false;
+    private LedgerTransaction transaction;
 
     public SendTransactionTask(TaskCallback callback, MobileLedgerProfile profile,
                                boolean simulate) {
@@ -70,8 +74,41 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
         mProfile = profile;
         simulate = false;
     }
-    private boolean sendOK() throws IOException {
+    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 {
+        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);
+
+        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)
@@ -84,17 +121,6 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
             return true;
         }
 
-        HttpURLConnection http = NetworkUtil.prepareConnection(mProfile, "add");
-        http.setRequestMethod("PUT");
-        http.setRequestProperty("Content-Type", "application/json");
-        http.setRequestProperty("Accept", "*/*");
-
-        ParsedLedgerTransaction jsonTransaction;
-        jsonTransaction = ltr.toParsedLedgerTransaction();
-        ObjectMapper mapper = new ObjectMapper();
-        ObjectWriter writer = mapper.writerFor(ParsedLedgerTransaction.class);
-        String body = writer.writeValueAsString(jsonTransaction);
-
         byte[] bodyBytes = body.getBytes(StandardCharsets.UTF_8);
         http.setDoOutput(true);
         http.setDoInput(true);
@@ -108,8 +134,8 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
             req.write(bodyBytes);
 
             final int responseCode = http.getResponseCode();
-            debug("network",
-                    String.format("Response: %d %s", responseCode, http.getResponseMessage()));
+            debug("network", String.format(Locale.US, "Response: %d %s", responseCode,
+                    http.getResponseMessage()));
 
             try (InputStream resp = http.getErrorStream()) {
 
@@ -117,8 +143,20 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
                     case 200:
                     case 201:
                         break;
-                    case 405:
+                    case 400:
+                    case 405: {
+                        BufferedReader reader = new BufferedReader(new InputStreamReader(resp));
+                        String line;
+                        int count = 0;
+                        while (count <= 5) {
+                            line = reader.readLine();
+                            if (line == null)
+                                break;
+                            Logger.debug("network", line);
+                            count++;
+                        }
                         return false; // will cause a retry with the legacy method
+                    }
                     default:
                         BufferedReader reader = new BufferedReader(new InputStreamReader(resp));
                         String line = reader.readLine();
@@ -147,14 +185,13 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
         if (token != null)
             params.addPair("_token", token);
 
-        Date transactionDate = ltr.getDate();
-        if (transactionDate == null) {
-            transactionDate = new GregorianCalendar().getTime();
-        }
+        SimpleDate transactionDate = transaction.getDateIfAny();
+        if (transactionDate == null)
+            transactionDate = SimpleDate.today();
 
         params.addPair("date", Globals.formatLedgerDate(transactionDate));
-        params.addPair("description", ltr.getDescription());
-        for (LedgerTransactionAccount acc : ltr.getAccounts()) {
+        params.addPair("description", transaction.getDescription());
+        for (LedgerTransactionAccount acc : transaction.getAccounts()) {
             params.addPair("account", acc.getAccountName());
             if (acc.isAmountSet())
                 params.addPair("amount", String.format(Locale.US, "%1.2f", acc.getAmount()));
@@ -226,21 +263,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);
-                }
+            transaction = ledgerTransactions[0];
+
+            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 v1_14:
+                    send_1_14_OK();
+                    break;
+                case v1_15:
+                    send_1_15_OK();
+                    break;
+                default:
+                    throw new IllegalStateException(
+                            "Unexpected API version: " + mProfile.getApiVersion());
             }
         }
         catch (Exception e) {
@@ -250,10 +308,19 @@ 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);
     }
-}
+
+}
\ No newline at end of file