X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FSendTransactionTask.java;h=796da9310d5fcf8445b505b846785aa8e62207aa;hb=aee821c8372ffafc705385072dba14dbc410f5b2;hp=0fd4a1b50fc284660d7663197d737f72af330404;hpb=217da55a224e2ae899d0b50604e2e54f882ec04f;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 0fd4a1b5..796da931 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/SendTransactionTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/SendTransactionTask.java
@@ -62,9 +62,9 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
     protected String error;
     private String token;
     private String session;
-    private LedgerTransaction ltr;
-    private MobileLedgerProfile mProfile;
-    private boolean simulate = false;
+    private LedgerTransaction transaction;
+    private final MobileLedgerProfile mProfile;
+    private final boolean simulate;
 
     public SendTransactionTask(TaskCallback callback, MobileLedgerProfile profile,
                                boolean simulate) {
@@ -84,7 +84,8 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
         http.setRequestProperty("Accept", "*/*");
 
         net.ktnx.mobileledger.json.v1_15.ParsedLedgerTransaction jsonTransaction =
-                net.ktnx.mobileledger.json.v1_15.ParsedLedgerTransaction.fromLedgerTransaction(ltr);
+                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);
@@ -99,7 +100,8 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
         http.setRequestProperty("Accept", "*/*");
 
         net.ktnx.mobileledger.json.v1_14.ParsedLedgerTransaction jsonTransaction =
-                net.ktnx.mobileledger.json.v1_14.ParsedLedgerTransaction.fromLedgerTransaction(ltr);
+                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);
@@ -135,8 +137,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()) {
 
@@ -175,14 +177,13 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
         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()));
@@ -258,7 +259,7 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
     protected Void doInBackground(LedgerTransaction... ledgerTransactions) {
         error = null;
         try {
-            ltr = ledgerTransactions[0];
+            transaction = ledgerTransactions[0];
 
             switch (mProfile.getApiVersion()) {
                 case auto:
@@ -316,7 +317,7 @@ public class SendTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
 
     public enum API {
         auto(0), html(-1), pre_1_15(-2), post_1_14(-3);
-        private static SparseArray<API> map = new SparseArray<>();
+        private static final SparseArray<API> map = new SparseArray<>();
 
         static {
             for (API item : API.values()) {