replace two literal charset names with pre-defined constants

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / async / SaveTransactionTask.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/async/SaveTransactionTask.java b/app/src/main/java/net/ktnx/mobileledger/async/SaveTransactionTask.java
index c4cc9a3ea7fa4171ac7844ef7d3fd671c965ea07..f23cba323f5e9d0bc5a32c8ebd2bf9e56dc455d9 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/async/SaveTransactionTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/SaveTransactionTask.java
@@ -23,6 +23,7 @@ import android.util.Log;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerTransaction;
 import net.ktnx.mobileledger.model.LedgerTransactionAccount;
+import net.ktnx.mobileledger.utils.Globals;
 import net.ktnx.mobileledger.utils.NetworkUtil;
 import net.ktnx.mobileledger.utils.UrlEncodedFormData;
 
@@ -32,6 +33,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -42,11 +44,11 @@ import static java.lang.Thread.sleep;
 
 public class SaveTransactionTask extends AsyncTask<LedgerTransaction, Void, Void> {
     private final TaskCallback taskCallback;
+    protected String error;
     private String token;
     private String session;
     private String backendUrl;
     private LedgerTransaction ltr;
-    protected String error;
 
     public SaveTransactionTask(TaskCallback callback) {
         taskCallback = callback;
@@ -65,7 +67,7 @@ public class SaveTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
         UrlEncodedFormData params = new UrlEncodedFormData();
         params.addPair("_formid", "identify-add");
         if (token != null) params.addPair("_token", token);
-        params.addPair("date", ltr.getDate());
+        params.addPair("date", Globals.formatLedgerDate(ltr.getDate()));
         params.addPair("description", ltr.getDescription());
         for (LedgerTransactionAccount acc : ltr.getAccounts()) {
             params.addPair("account", acc.getAccountName());
@@ -81,14 +83,15 @@ public class SaveTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
 
         try (OutputStream req = http.getOutputStream()) {
             Log.d("network", "Request body: " + body);
-            req.write(body.getBytes("ASCII"));
+            req.write(body.getBytes(StandardCharsets.US_ASCII));
 
             try (InputStream resp = http.getInputStream()) {
                 Log.d("update_accounts", String.valueOf(http.getResponseCode()));
                 if (http.getResponseCode() == 303) {
                     // everything is fine
                     return true;
-                } else if (http.getResponseCode() == 200) {
+                }
+                else if (http.getResponseCode() == 200) {
                     // get the new cookie
                     {
                         Pattern reSessionCookie = Pattern.compile("_SESSION=([^;]+);.*");
@@ -101,17 +104,21 @@ public class SaveTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
                             if (m.matches()) {
                                 session = m.group(1);
                                 Log.d("network", "new session is " + session);
-                            } else {
+                            }
+                            else {
                                 Log.d("network", "set-cookie: " + cookie);
-                                Log.w("network", "Response Set-Cookie headers is not a _SESSION one");
+                                Log.w("network",
+                                        "Response Set-Cookie headers is not a _SESSION one");
                             }
-                        } else {
+                        }
+                        else {
                             Log.w("network", "Response has no Set-Cookie header");
                         }
                     }
                     // the token needs to be updated
                     BufferedReader reader = new BufferedReader(new InputStreamReader(resp));
-                    Pattern re = Pattern.compile("<input type=\"hidden\" name=\"_token\" value=\"([^\"]+)\">");
+                    Pattern re = Pattern.compile(
+                            "<input type=\"hidden\" name=\"_token\" value=\"([^\"]+)\">");
                     String line;
                     while ((line = reader.readLine()) != null) {
                         //Log.d("dump", line);
@@ -124,8 +131,10 @@ public class SaveTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
                         }
                     }
                     throw new IOException("Can't find _token string");
-                } else {
-                    throw new IOException(String.format("Error response code %d", http.getResponseCode()));
+                }
+                else {
+                    throw new IOException(
+                            String.format("Error response code %d", http.getResponseCode()));
                 }
             }
         }