X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2FRetrieveAccountsTask.java;h=f1511f8051dc4fb4ee71eba7f98f49d65f0d295a;hp=a2590300a2f51572f00e7feab66bf2b5c64eefd8;hb=c84b0a8df3e90430f032f3b4b58726aec8f6d029;hpb=977ec47877ac3bd6f1b61b3edea8ad63cee7b982

diff --git a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
index a2590300..f1511f80 100644
--- a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
@@ -39,22 +39,26 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDa
                     throw new IOException(String.valueOf(R.string.err_http_error));
                 }
                 else {
+                    if (db.inTransaction()) throw new AssertionError();
+
                     db.beginTransaction();
-                    db.execSQL("delete from account_values;");
-                    db.execSQL("delete from accounts;");
 
                     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("<span class=\"[^\"]*\\bamount\\b[^\"]*\">([\\d.,]+)(?:\\s+(\\S+))?</span>");
+                        Pattern value_re = Pattern.compile("<span class=\"[^\"]*\\bamount\\b[^\"]*\">\\s*([-+]?[\\d.,]+)(?:\\s+(\\S+))?</span>");
+                        Pattern tr_re = Pattern.compile("</tr>");
                         int count = 0;
                         while ((line = buf.readLine()) != null) {
 
                             Matcher m = re.matcher(line);
-                            while (m.find()) {
+                            if (m.find()) {
                                 String acct_encoded = m.group(1);
                                 String acct_name = URLDecoder.decode(acct_encoded, "UTF-8");
                                 acct_name = acct_name.replace("\"", "");
@@ -64,6 +68,14 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDa
                                 publishProgress(++count);
 
                                 last_account_name = acct_name;
+
+                                continue;
+                            }
+
+                            Matcher tr_m = tr_re.matcher(line);
+                            if (tr_m.find()) {
+                                last_account_name = null;
+                                continue;
                             }
 
                             if (last_account_name == null) continue;