X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2FRetrieveAccountsTask.java;h=8532e1ac2f270c25dbb7d155fe4d71a734106817;hb=e4e8a971af5e7264dc44a8177cecb1755653bb25;hp=0956f63822b74bae4bd8efb291853d38f8485a91;hpb=4a80939836e8e3c3a63ca1d5e905f8f1e03fb122;p=mobile-ledger.git
diff --git a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
index 0956f638..8532e1ac 100644
--- a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
@@ -1,114 +1,170 @@
+/*
+ * Copyright © 2018 Damyan Ivanov.
+ * This file is part of Mobile-Ledger.
+ * Mobile-Ledger 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,
+ * 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 .
+ */
+
package net.ktnx.mobileledger;
import android.content.SharedPreferences;
+import android.database.sqlite.SQLiteDatabase;
import android.util.Log;
import java.io.BufferedReader;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.lang.ref.WeakReference;
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URLDecoder;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import static net.ktnx.mobileledger.MobileLedgerDB.db;
-
-abstract public class RetrieveAccountsTask extends android.os.AsyncTask {
+class RetrieveAccountsTask extends android.os.AsyncTask {
int error;
private SharedPreferences pref;
- public void setPref(SharedPreferences pref) {
- this.pref = pref;
- }
- public RetrieveAccountsTask() {
+ WeakReference mContext;
+
+ RetrieveAccountsTask(WeakReference context) {
+ mContext = context;
error = 0;
}
+ void setPref(SharedPreferences pref) {
+ this.pref = pref;
+ }
+
protected Void doInBackground(Void... params) {
try {
HttpURLConnection http = NetworkUtil.prepare_connection( pref, "add");
http.setAllowUserInteraction(false);
http.setRequestProperty("Accept-Charset", "UTF-8");
publishProgress(0);
- InputStream resp = http.getInputStream();
- try {
- Log.d("update_accounts", String.valueOf(http.getResponseCode()));
- if (http.getResponseCode() != 200) {
- throw new IOException(String.valueOf(R.string.err_http_error));
- }
- else {
- if (db.inTransaction()) throw new AssertionError();
-
- db.beginTransaction();
-
- try {
- db.execSQL("update account_values set keep=0;");
- db.execSQL("update accounts set keep=0;");
-
- String line;
- String last_account_name = null;
- BufferedReader buf = new BufferedReader(new InputStreamReader(resp, "UTF-8"));
- // %3A is '='
- Pattern re = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
- Pattern value_re = Pattern.compile("\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?");
- Pattern tr_re = Pattern.compile("");
- int count = 0;
- while ((line = buf.readLine()) != null) {
-
- Matcher m = re.matcher(line);
- if (m.find()) {
- String acct_encoded = m.group(1);
- String acct_name = URLDecoder.decode(acct_encoded, "UTF-8");
- acct_name = acct_name.replace("\"", "");
- Log.d("account-parser", acct_name);
-
- db.execSQL("insert or replace into accounts(name, keep) values(?, 1)", new Object[]{acct_name} );
- publishProgress(++count);
-
- last_account_name = acct_name;
-
- continue;
+ try(MobileLedgerDatabase dbh = new MobileLedgerDatabase(mContext.get())) {
+ try(SQLiteDatabase db = dbh.getWritableDatabase()) {
+ try (InputStream resp = http.getInputStream()) {
+ Log.d("update_accounts", String.valueOf(http.getResponseCode()));
+ if (http.getResponseCode() != 200) {
+ throw new IOException(
+ String.format("HTTP error: %d %s", http.getResponseCode(), http.getResponseMessage()));
+ }
+ else {
+ if (db.inTransaction()) throw new AssertionError();
+
+ db.beginTransaction();
+
+ try {
+ db.execSQL("update account_values set keep=0;");
+ db.execSQL("update accounts set keep=0;");
+
+ String line;
+ String last_account_name = null;
+ BufferedReader buf =
+ new BufferedReader(new InputStreamReader(resp, "UTF-8"));
+ // %3A is '='
+ Pattern account_name_re = Pattern.compile("/register\\?q=inacct%3A([a-zA-Z0-9%]+)\"");
+ Pattern value_re = Pattern.compile(
+ "\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?");
+ Pattern tr_re = Pattern.compile("");
+ Pattern descriptions_line_re = Pattern.compile("\\bdescriptionsSuggester\\s*=\\s*new\\b");
+ Pattern description_items_re = Pattern.compile("\"value\":\"([^\"]+)\"");
+ int count = 0;
+ while ((line = buf.readLine()) != null) {
+ Matcher m = account_name_re.matcher(line);
+ if (m.find()) {
+ String acct_encoded = m.group(1);
+ String acct_name = URLDecoder.decode(acct_encoded, "UTF-8");
+ acct_name = acct_name.replace("\"", "");
+ Log.d("account-parser", acct_name);
+
+ addAccount(db, acct_name);
+ publishProgress(++count);
+
+ last_account_name = acct_name;
+
+ continue;
+ }
+
+ Matcher tr_m = tr_re.matcher(line);
+ if (tr_m.find()) {
+ Log.d("account-parser", " - another account expected");
+ last_account_name = null;
+ continue;
+ }
+
+ if (last_account_name != null) {
+ m = value_re.matcher(line);
+ boolean match_found = false;
+ while (m.find()) {
+ match_found = true;
+ String value = m.group(1);
+ String currency = m.group(2);
+ if (currency == null) currency = "";
+ value = value.replace(',', '.');
+ Log.d("db", "curr=" + currency + ", value=" + value);
+ db.execSQL(
+ "insert or replace into account_values(account, currency, value, keep) values(?, ?, ?, 1);",
+ new Object[]{last_account_name, currency, Float.valueOf(value)
+ });
+ }
+
+ if (match_found) continue;
+ }
+
+ m = descriptions_line_re.matcher(line);
+ if (m.find()) {
+ db.execSQL("update description_history set keep=0;");
+ m = description_items_re.matcher(line);
+ while (m.find()) {
+ String description = m.group(1);
+ if (description.isEmpty()) continue;
+
+ Log.d("db", String.format("Stored description: %s",
+ description));
+ db.execSQL("insert or replace into description_history"
+ + "(description, description_upper, keep) " + "values(?, ?, 1);",
+ new Object[]{description, description.toUpperCase()
+ });
+ }
+ }
+ }
+
+ db.execSQL("delete from account_values where keep=0;");
+ db.execSQL("delete from accounts where keep=0;");
+// db.execSQL("delete from description_history where keep=0;");
+ db.setTransactionSuccessful();
}
-
- Matcher tr_m = tr_re.matcher(line);
- if (tr_m.find()) {
- last_account_name = null;
- continue;
+ finally {
+ db.endTransaction();
}
- if (last_account_name == null) continue;
-
- m = value_re.matcher(line);
- while (m.find()) {
- String value = m.group(1);
- String currency = m.group(2);
- if(currency == null) currency="";
- value = value.replace(',', '.');
- Log.d("db", "curr="+currency+", value="+value);
- db.execSQL("insert or replace into account_values(account, currency, value, keep) values(?, ?, ?, 1);",
- new Object[]{last_account_name, currency, Float.valueOf(value)});
- }
}
-
- db.execSQL("delete from account_values where keep=0;");
- db.execSQL("delete from accounts where keep=0;");
- db.setTransactionSuccessful();
- }
- finally {
- db.endTransaction();
}
-
}
}
- finally {
- resp.close();
- }
} catch (MalformedURLException e) {
error = R.string.err_bad_backend_url;
e.printStackTrace();
- } catch (IOException e) {
+ }
+ catch (FileNotFoundException e) {
+ error = R.string.err_bad_auth;
+ e.printStackTrace();
+ }
+ catch (IOException e) {
error = R.string.err_net_io_error;
e.printStackTrace();
}
@@ -120,7 +176,23 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask