X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2FRetrieveAccountsTask.java;h=670b14935e21328d4453e3e77892eda69658e61e;hb=2e50c2cb25c89fa2ba11ba6bec0c79aca995277a;hp=b3ad57784962577c78f88fc3f8ffe1838f6904cd;hpb=b92c4052269edfc2f976ecdc3d58044cd6d9935e;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 b3ad5778..670b1493 100644
--- a/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/RetrieveAccountsTask.java
@@ -39,6 +39,8 @@ 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();
 
                     try {
@@ -62,7 +64,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 +87,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 {