fix refresh mangling with account "starred" status

diff --git a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
index f4d246a66a80f19e02fa388578b11a8ffa94d901..4e2c6108f5d1eb79f74d8898b8b25899d8f2fdf5 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/RetrieveTransactionsTask.java
@@ -113,6 +113,7 @@ public class RetrieveTransactionsTask
         ArrayList<LedgerTransaction> transactionList = new ArrayList<>();
         HashMap<String, Void> accountNames = new HashMap<>();
         LedgerAccount lastAccount = null;
         ArrayList<LedgerTransaction> transactionList = new ArrayList<>();
         HashMap<String, Void> accountNames = new HashMap<>();
         LedgerAccount lastAccount = null;

+        boolean onlyStarred = Data.optShowOnlyStarred.get();

         Data.backgroundTaskCount.incrementAndGet();
         try {
             HttpURLConnection http = NetworkUtil.prepare_connection("journal");
         Data.backgroundTaskCount.incrementAndGet();
         try {
             HttpURLConnection http = NetworkUtil.prepare_connection("journal");


@@ -165,8 +166,11 @@ public class RetrieveTransactionsTask
                                         acct_name = acct_name.replace("\"", "");
                                         L(String.format("found account: %s", acct_name));
 
                                         acct_name = acct_name.replace("\"", "");
                                         L(String.format("found account: %s", acct_name));
 

-                                        profile.storeAccount(acct_name);
-                                        lastAccount = new LedgerAccount(acct_name);
+                                        lastAccount = profile.loadAccount(acct_name);
+                                        if (lastAccount == null) {
+                                            lastAccount = new LedgerAccount(acct_name);
+                                            profile.storeAccount(lastAccount);
+                                        }

 
                                         // make sure the parent account(s) are present,
                                         // synthesising them if necessary
 
                                         // make sure the parent account(s) are present,
                                         // synthesising them if necessary


@@ -182,14 +186,17 @@ public class RetrieveTransactionsTask
                                             while (!toAppend.isEmpty()) {
                                                 String aName = toAppend.pop();
                                                 LedgerAccount acc = new LedgerAccount(aName);
                                             while (!toAppend.isEmpty()) {
                                                 String aName = toAppend.pop();
                                                 LedgerAccount acc = new LedgerAccount(aName);

-                                                accountList.add(acc);
+                                                acc.setHidden(lastAccount.isHidden());
+                                                if (!onlyStarred || !acc.isHidden())
+                                                    accountList.add(acc);

                                                 L(String.format("gap-filling with %s", aName));
                                                 accountNames.put(aName, null);
                                                 L(String.format("gap-filling with %s", aName));
                                                 accountNames.put(aName, null);

-                                                profile.storeAccount(aName);
+                                                profile.storeAccount(acc);

                                             }
                                         }
 
                                             }
                                         }
 

-                                        accountList.add(lastAccount);
+                                        if (!onlyStarred || !lastAccount.isHidden())
+                                            accountList.add(lastAccount);

                                         accountNames.put(acct_name, null);
 
                                         state = ParserState.EXPECTING_ACCOUNT_AMOUNT;
                                         accountNames.put(acct_name, null);
 
                                         state = ParserState.EXPECTING_ACCOUNT_AMOUNT;

diff --git a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
index 36e317af42be4a0714a76a1e483891ab1953bee0..6fc2551f592d650fb6a396e1d92d025b2119d8fe 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
+++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java
@@ -180,16 +180,18 @@ public final class MobileLedgerProfile {
             db.endTransaction();
         }
     }
             db.endTransaction();
         }
     }

-    public void storeAccount(String name) {
+    public void storeAccount(LedgerAccount acc) {

         SQLiteDatabase db = MLDB.getWritableDatabase();
 
         SQLiteDatabase db = MLDB.getWritableDatabase();
 

-        do {
-            LedgerAccount acc = new LedgerAccount(name);
-            db.execSQL("replace into accounts(profile, name, name_upper, level, keep) values(?, " +
-                       "?, ?, ?, 1)",
-                    new Object[]{this.uuid, name, name.toUpperCase(), acc.getLevel()});
-            name = acc.getParentName();
-        } while (name != null);
+        // replace into is a bad idea because it would reset hidden to its default value
+        // we like the default, but for new accounts only
+        db.execSQL("update accounts set level = ?, keep = 1 where profile=? and name = ?",
+                new Object[]{acc.getLevel(), uuid, acc.getName()});
+        db.execSQL("insert into accounts(profile, name, name_upper, parent_name, level) " +
+                   "select ?,?,?,?,? where (select changes() = 0)",
+                new Object[]{uuid, acc.getName(), acc.getName().toUpperCase(), acc.getParentName(),
+                             acc.getLevel()
+                });

     }
     public void storeAccountValue(String name, String currency, Float amount) {
         SQLiteDatabase db = MLDB.getWritableDatabase();
     }
     public void storeAccountValue(String name, String currency, Float amount) {
         SQLiteDatabase db = MLDB.getWritableDatabase();


@@ -276,4 +278,19 @@ public final class MobileLedgerProfile {
         Log.d("db", String.format("removing progile %s from DB", uuid));
         db.execSQL("delete from profiles where uuid=?", new Object[]{uuid});
     }
         Log.d("db", String.format("removing progile %s from DB", uuid));
         db.execSQL("delete from profiles where uuid=?", new Object[]{uuid});
     }

+    public LedgerAccount loadAccount(String name) {
+        SQLiteDatabase db = MLDB.getReadableDatabase();
+        try (Cursor cursor = db.rawQuery("SELECT hidden from accounts where profile=? and name=?",
+                new String[]{uuid, name}))
+        {
+            if (cursor.moveToFirst()) {
+                LedgerAccount acc = new LedgerAccount(name);
+                acc.setHidden(cursor.getInt(0) == 1);
+
+                return acc;
+            }
+        }
+
+        return null;
+    }

 }
 }