X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FSaveTransactionTask.java;h=d47eaa7364472d48f2feb32f860165a08a45a971;hb=0974c053bfa714958b1ce911865907085232a6d9;hp=913fddc5dd831bdd92a1d338ce80f7e6ddc7c53c;hpb=3b365016042215dd73cb4600840aa8199b8322b9;p=mobile-ledger.git
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 913fddc5..d47eaa73 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/SaveTransactionTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/SaveTransactionTask.java
@@ -1,18 +1,18 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
* under the term of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.async;
@@ -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;
@@ -41,18 +43,18 @@ import java.util.regex.Pattern;
import static java.lang.Thread.sleep;
public class SaveTransactionTask extends AsyncTask {
- private final TaskCallback task_callback;
+ private final TaskCallback taskCallback;
+ protected String error;
private String token;
private String session;
- private String backend_url;
+ private String backendUrl;
private LedgerTransaction ltr;
- protected String error;
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", "*/*");
@@ -63,15 +65,15 @@ public class SaveTransactionTask extends AsyncTask> header = http.getHeaderFields();
- List cookie_header = header.get("Set-Cookie");
- if (cookie_header != null) {
- String cookie = cookie_header.get(0);
- Matcher m = sess_cookie_re.matcher(cookie);
+ List 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);
- } 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("");
+ Pattern re = Pattern.compile(
+ "");
String line;
while ((line = reader.readLine()) != null) {
//Log.d("dump", line);
@@ -124,8 +131,10 @@ public class SaveTransactionTask extends AsyncTask= 2)
@@ -162,6 +171,6 @@ public class SaveTransactionTask extends AsyncTask