pkg-private methods

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / RetrieveAccountsTask.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
index b3ad57784962577c78f88fc3f8ffe1838f6904cd..60583f9b13ec7afadd3e96689ad216ce18955594 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
@@ -1,7 +1,6 @@
 package net.ktnx.mobileledger;
 
 import android.content.SharedPreferences;
-import android.database.sqlite.SQLiteDatabase;
 import android.util.Log;
 
 import java.io.BufferedReader;
@@ -14,19 +13,22 @@ import java.net.URLDecoder;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDatabase, Integer, Void> {
+import static net.ktnx.mobileledger.MobileLedgerDB.db;
+
+abstract public class RetrieveAccountsTask extends android.os.AsyncTask<Void, Integer, Void> {
     int error;
 
     private SharedPreferences pref;
-    public void setPref(SharedPreferences pref) {
-        this.pref = pref;
-    }
-    public RetrieveAccountsTask() {
+
+    RetrieveAccountsTask() {
         error = 0;
     }
 
-    protected Void doInBackground(SQLiteDatabase... sqLiteDatabases) {
-        final SQLiteDatabase db = sqLiteDatabases[0];
+    void setPref(SharedPreferences pref) {
+        this.pref = pref;
+    }
+
+    protected Void doInBackground(Void... params) {
         try {
             HttpURLConnection http = NetworkUtil.prepare_connection( pref, "add");
             http.setAllowUserInteraction(false);
@@ -36,9 +38,11 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDa
             try {
                 Log.d("update_accounts", String.valueOf(http.getResponseCode()));
                 if (http.getResponseCode() != 200) {
-                    throw new IOException(String.valueOf(R.string.err_http_error));
+                    throw new IOException(String.format("HTTP error: %d %s", http.getResponseCode(), http.getResponseMessage()));
                 }
                 else {
+                    if (db.inTransaction()) throw new AssertionError();
+
                     db.beginTransaction();
 
                     try {
@@ -62,7 +66,7 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDa
                                 acct_name = acct_name.replace("\"", "");
                                 Log.d("account-parser", acct_name);
 
-                                db.execSQL("insert into accounts(name) values(?)", new Object[]{acct_name} );
+                                db.execSQL("insert or replace into accounts(name, keep) values(?, 1)", new Object[]{acct_name} );
                                 publishProgress(++count);
 
                                 last_account_name = acct_name;
@@ -85,11 +89,13 @@ abstract public class RetrieveAccountsTask extends android.os.AsyncTask<SQLiteDa
                                 if(currency == null) currency="";
                                 value = value.replace(',', '.');
                                 Log.d("db", "curr="+currency+", value="+value);
-                                db.execSQL("insert into account_values(account, currency, value) values(?, ?, ?);",
+                                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 {