X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FSaveTransactionTask.java;h=c4cc9a3ea7fa4171ac7844ef7d3fd671c965ea07;hp=5ccbaaca56922dda8c2925ac454b14ce2d7e363e;hb=bde37d0aa472d31606b53491240c79af3374f09b;hpb=e3872d583f324e225580a6fd05568d36e4ba0db0

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 5ccbaaca..c4cc9a3e 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/SaveTransactionTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/SaveTransactionTask.java
@@ -17,10 +17,10 @@
 
 package net.ktnx.mobileledger.async;
 
-import android.content.SharedPreferences;
 import android.os.AsyncTask;
 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.NetworkUtil;
@@ -41,23 +41,18 @@ import java.util.regex.Pattern;
 import static java.lang.Thread.sleep;
 
 public class SaveTransactionTask extends AsyncTask<LedgerTransaction, Void, Void> {
-    private final TaskCallback task_callback;
+    private final TaskCallback taskCallback;
     private String token;
     private String session;
-    private String backend_url;
+    private String backendUrl;
     private LedgerTransaction ltr;
     protected String error;
 
-    private SharedPreferences pref;
-    public void setPref(SharedPreferences pref) {
-        this.pref = pref;
-    }
-
     public SaveTransactionTask(TaskCallback callback) {
-        task_callback = callback;
+        taskCallback = callback;
     }
-    private boolean send_ok() throws IOException {
-        HttpURLConnection http = NetworkUtil.prepare_connection("add");
+    private boolean sendOK() throws IOException {
+        HttpURLConnection http = NetworkUtil.prepareConnection("add");
         http.setRequestMethod("POST");
         http.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
         http.setRequestProperty("Accept", "*/*");
@@ -68,15 +63,15 @@ public class SaveTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
         http.setDoInput(true);
 
         UrlEncodedFormData params = new UrlEncodedFormData();
-        params.add_pair("_formid", "identify-add");
-        if (token != null) params.add_pair("_token", token);
-        params.add_pair("date", ltr.getDate());
-        params.add_pair("description", ltr.getDescription());
+        params.addPair("_formid", "identify-add");
+        if (token != null) params.addPair("_token", token);
+        params.addPair("date", ltr.getDate());
+        params.addPair("description", ltr.getDescription());
         for (LedgerTransactionAccount acc : ltr.getAccounts()) {
-            params.add_pair("account", acc.getAccountName());
+            params.addPair("account", acc.getAccountName());
             if (acc.isAmountSet())
-                params.add_pair("amount", String.format(Locale.US, "%1.2f", acc.getAmount()));
-            else params.add_pair("amount", "");
+                params.addPair("amount", String.format(Locale.US, "%1.2f", acc.getAmount()));
+            else params.addPair("amount", "");
         }
 
         String body = params.toString();
@@ -96,13 +91,13 @@ public class SaveTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
                 } else if (http.getResponseCode() == 200) {
                     // get the new cookie
                     {
-                        Pattern sess_cookie_re = Pattern.compile("_SESSION=([^;]+);.*");
+                        Pattern reSessionCookie = Pattern.compile("_SESSION=([^;]+);.*");
 
                         Map<String, List<String>> header = http.getHeaderFields();
-                        List<String> cookie_header = header.get("Set-Cookie");
-                        if (cookie_header != null) {
-                            String cookie = cookie_header.get(0);
-                            Matcher m = sess_cookie_re.matcher(cookie);
+                        List<String> cookieHeader = header.get("Set-Cookie");
+                        if (cookieHeader != null) {
+                            String cookie = cookieHeader.get(0);
+                            Matcher m = reSessionCookie.matcher(cookie);
                             if (m.matches()) {
                                 session = m.group(1);
                                 Log.d("network", "new session is " + session);
@@ -140,11 +135,11 @@ public class SaveTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
     protected Void doInBackground(LedgerTransaction... ledgerTransactions) {
         error = null;
         try {
-            backend_url = pref.getString("backend_url", "");
+            backendUrl = Data.profile.get().getUrl();
             ltr = ledgerTransactions[0];
 
             int tried = 0;
-            while (!send_ok()) {
+            while (!sendOK()) {
                 try {
                     tried++;
                     if (tried >= 2)
@@ -167,6 +162,6 @@ public class SaveTransactionTask extends AsyncTask<LedgerTransaction, Void, Void
     @Override
     protected void onPostExecute(Void aVoid) {
         super.onPostExecute(aVoid);
-        task_callback.done(error);
+        taskCallback.done(error);
     }
 }