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 transaction;
- private MobileLedgerProfile mProfile;
- private boolean simulate = false;
public SendTransactionTask(TaskCallback callback, MobileLedgerProfile profile,
boolean simulate) {
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:
+ 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();
if (token != null)
params.addPair("_token", token);
- SimpleDate transactionDate = transaction.getDate();
- if (transactionDate == null) {
+ SimpleDate transactionDate = transaction.getDateIfAny();
+ if (transactionDate == null)
transactionDate = SimpleDate.today();
- }
params.addPair("date", Globals.formatLedgerDate(transactionDate));
params.addPair("description", transaction.getDescription());
case html:
legacySendOkWithRetry();
break;
- case pre_1_15:
+ case v1_14:
send_1_14_OK();
break;
- case post_1_14:
+ case v1_15:
send_1_15_OK();
break;
default:
}
public enum API {
- auto(0), html(-1), pre_1_15(-2), post_1_14(-3);
- private static SparseArray<API> map = new SparseArray<>();
+ auto(0), html(-1), v1_14(-2), v1_15(-3), v1_19_1(-4);
+ private static final SparseArray<API> map = new SparseArray<>();
+ public static API[] allVersions = {v1_19_1, v1_15, v1_14};
static {
for (API item : API.values()) {
}
}
- private int value;
+ private final int value;
API(int value) {
this.value = value;
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);
+ case v1_14:
+ return resources.getString(R.string.api_1_14);
+ case v1_15:
+ return resources.getString(R.string.api_1_15);
+ case v1_19_1:
+ return resources.getString(R.string.api_1_19_1);
default:
throw new IllegalStateException("Unexpected value: " + value);
}
}
+ public String getDescription() {
+ switch (this) {
+ case auto:
+ return "(automatic)";
+ case html:
+ return "(HTML)";
+ case v1_14:
+ return "1.14";
+ case v1_15:
+ return "1.15";
+ case v1_19_1:
+ return "1.19.1";
+ default:
+ throw new IllegalStateException("Unexpected value: " + this);
+ }
+ }
}
-}
+}
\ No newline at end of file