X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2FRetrieveAccountsTask.java;h=a2590300a2f51572f00e7feab66bf2b5c64eefd8;hb=977ec47877ac3bd6f1b61b3edea8ad63cee7b982;hp=60e6c4564eace74d89facdad4f8667c509a6e70e;hpb=eb198c42090580a7bc2e72e1ba4738eda914ce3e;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 60e6c456..a2590300 100644
--- a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
@@ -8,19 +8,16 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.net.Authenticator;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
-import java.net.PasswordAuthentication;
-import java.net.URL;
 import java.net.URLDecoder;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDatabase, Void, Void> {
-    private int error;
+abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDatabase, Integer, Void> {
+    int error;
 
-    SharedPreferences pref;
+    private SharedPreferences pref;
     public void setPref(SharedPreferences pref) {
         this.pref = pref;
     }
@@ -29,44 +26,33 @@ public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDatabase, V
     }
 
     protected Void doInBackground(SQLiteDatabase... sqLiteDatabases) {
-        final String backend_url = pref.getString("backend_url", "");
-        final boolean use_auth = pref.getBoolean("backend_use_http_auth", false);
         final SQLiteDatabase db = sqLiteDatabases[0];
         try {
-            Log.d("update_accounts", "Connecting to "+backend_url);
-            HttpURLConnection http = (HttpURLConnection) new URL(backend_url + "/journal").openConnection();
-            if (use_auth) {
-                final String auth_user = pref.getString("backend_auth_user", "");
-                final String auth_password = pref.getString("backend_auth_password", "");
-                Authenticator.setDefault(new Authenticator() {
-                    @Override
-                    protected PasswordAuthentication getPasswordAuthentication() {
-                        Log.d("http-auth", "called");
-                        return new PasswordAuthentication(auth_user, auth_password.toCharArray());
-                    }
-                });
-//                final String basic_auth = String.format("Basic %s:%s", auth_user, auth_password);
-//                http.setRequestProperty("Authorization", basic_auth);
-                Log.d("update_accounts", "Will auth as "+auth_user+" with password of "+auth_password.length()+" characters");
-            }
-            http.setAllowUserInteraction(true);
+            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) {
-                    error = R.string.err_http_error;
+                    throw new IOException(String.valueOf(R.string.err_http_error));
                 }
                 else {
                     db.beginTransaction();
+                    db.execSQL("delete from account_values;");
                     db.execSQL("delete from accounts;");
 
                     try {
                         String line;
+                        String last_account_name = null;
                         BufferedReader buf = new BufferedReader(new InputStreamReader(resp, "UTF-8"));
                         // %3A is '='
-                        Pattern re = Pattern.compile('"' + backend_url + "/register\\?q=inacct%3A([a-zA-Z0-9%]+)\\\"");
+                        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>");
+                        int count = 0;
                         while ((line = buf.readLine()) != null) {
+
                             Matcher m = re.matcher(line);
                             while (m.find()) {
                                 String acct_encoded = m.group(1);
@@ -75,6 +61,22 @@ public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDatabase, V
                                 Log.d("account-parser", acct_name);
 
                                 db.execSQL("insert into accounts(name) values(?)", new Object[]{acct_name} );
+                                publishProgress(++count);
+
+                                last_account_name = acct_name;
+                            }
+
+                            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 into account_values(account, currency, value) values(?, ?, ?);",
+                                        new Object[]{last_account_name, currency, Float.valueOf(value)});
                             }
                         }
 
@@ -104,10 +106,7 @@ public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDatabase, V
         return null;
     }
 
-    protected void onPostExecute(Void result) {
-        if (error != 0)
-            Log.e("async-http", String.valueOf(error));
-        else
-            Log.d("async-http", "Accounts updated successfuly");
-    }
+    abstract protected void onProgressUpdate(Integer... values);
+
+    abstract protected void onPostExecute(Void result);
 }