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.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;
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) {
mProfile = profile;
simulate = false;
}
- private boolean send_1_15_OK() 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", "*/*");
- 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", "*/*");
-
- 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);
+ Gateway gateway = Gateway.forApiVersion(apiVersion);
+ String body = gateway.transactionSaveRequest(transaction);
return sendRequest(http, 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()) {
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));
+ 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 another method
+ }
default:
BufferedReader reader = new BufferedReader(new InputStreamReader(resp));
String line = reader.readLine();
if (token != null)
params.addPair("_token", token);
- SimpleDate transactionDate = ltr.getDate();
- if (transactionDate == null) {
+ 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()));
protected Void doInBackground(LedgerTransaction... ledgerTransactions) {
error = null;
try {
- ltr = ledgerTransactions[0];
+ transaction = ledgerTransactions[0];
- switch (mProfile.getApiVersion()) {
+ final API profileApiVersion = 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();
- }
- else {
- Logger.debug("network", "Version 1.14 request succeeded");
+ 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;
}
}
- 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) {
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
projects / mobile-ledger.git / blobdiff