X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FSendTransactionTask.java;h=14d41f9f14a9bffeef548d94b264db5382628b20;hb=87181c0cb019c0a1a0a0ce2a4592795f87b5957c;hp=f4c7ce1fdd48ced4e421e6ea0edad468fc66a0f5;hpb=bd5da50ef980c0c9657ec1e9c3e681ab5092f438;p=mobile-ledger-staging.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 f4c7ce1f..14d41f9f 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 @@ -20,15 +20,15 @@ package net.ktnx.mobileledger.async; import android.os.AsyncTask; 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.json.API; +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; +import net.ktnx.mobileledger.utils.SimpleDate; import net.ktnx.mobileledger.utils.UrlEncodedFormData; import java.io.BufferedReader; @@ -47,44 +47,73 @@ 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 { 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 LedgerTransaction transaction; + 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 { + private boolean sendOK(API apiVersion) 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(); - ObjectMapper mapper = new ObjectMapper(); - ObjectWriter writer = mapper.writerFor(ParsedLedgerTransaction.class); - String body = writer.writeValueAsString(jsonTransaction); + Gateway gateway = Gateway.forApiVersion(apiVersion); + String body = gateway.transactionSaveRequest(transaction); + + 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)); - debug("network", "request header: " + http.getRequestProperties().toString()); + debug("network", "request header: " + http.getRequestProperties() + .toString()); try (OutputStream req = http.getOutputStream()) { debug("network", "Request body: " + body); 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()) { @@ -92,8 +121,20 @@ public class SendTransactionTask extends AsyncTask= 2) - throw new IOException(String.format("aborting after %d tries", tried)); - sleep(100); - } + transaction = ledgerTransactions[0]; + + final API profileApiVersion = mProfile.getApiVersion(); + switch (profileApiVersion) { + case auto: + boolean sendOK = false; + for (API ver : API.allVersions) { + Logger.debug("network", "Trying version " + ver); + if (sendOK(ver)) { + sendOK = true; + Logger.debug("network", "Version " + ver + " request succeeded"); + + break; + } + } + if (!sendOK) { + Logger.debug("network", "Trying HTML form emulation"); + legacySendOkWithRetry(); + } + break; + case html: + legacySendOkWithRetry(); + break; + case v1_14: + case v1_15: + case v1_19_1: + sendOK(profileApiVersion); + break; + default: + throw new IllegalStateException("Unexpected API version: " + profileApiVersion); } } catch (Exception e) { @@ -216,10 +284,19 @@ public class SendTransactionTask extends AsyncTask= 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