X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FUpdateAccountsTask.java;h=ad030ef6a1d44a26d529ad73befcba4443c1eace;hp=8d17a548d447cd8d21ff81e7818a09755e4c71d9;hb=c6fe580ac5a93cff593d95a0fe34bd6c2c7bddfc;hpb=1108e69e3c14e3b8d9f0c7e0c997f2e1a6a61adb

diff --git a/app/src/main/java/net/ktnx/mobileledger/async/UpdateAccountsTask.java b/app/src/main/java/net/ktnx/mobileledger/async/UpdateAccountsTask.java
index 8d17a548..ad030ef6 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateAccountsTask.java
@@ -24,6 +24,7 @@ import android.util.Log;
 
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerAccount;
+import net.ktnx.mobileledger.model.MobileLedgerProfile;
 import net.ktnx.mobileledger.utils.MLDB;
 
 import java.util.ArrayList;
@@ -32,13 +33,14 @@ public class UpdateAccountsTask extends AsyncTask<Void, Void, ArrayList<LedgerAc
     protected ArrayList<LedgerAccount> doInBackground(Void... params) {
         Data.backgroundTaskCount.incrementAndGet();
         try {
-            String profileUUID = Data.profile.get().getUuid();
+            MobileLedgerProfile profile = Data.profile.get();
+            String profileUUID = profile.getUuid();
             boolean onlyStarred = Data.optShowOnlyStarred.get();
             ArrayList<LedgerAccount> newList = new ArrayList<>();
 
-            String sql = "SELECT name, hidden FROM accounts WHERE profile = ?";
-            if (onlyStarred) sql += " AND hidden = 0";
-            sql += " ORDER BY name";
+            String sql = "SELECT a.name from accounts a WHERE a.profile = ?";
+            if (onlyStarred) sql += " AND a.hidden = 0";
+            sql += " ORDER BY a.name";
 
             SQLiteDatabase db = MLDB.getReadableDatabase();
             try (Cursor cursor = db.rawQuery(sql, new String[]{profileUUID})) {
@@ -46,17 +48,8 @@ public class UpdateAccountsTask extends AsyncTask<Void, Void, ArrayList<LedgerAc
                     final String accName = cursor.getString(0);
 //                    Log.d("accounts",
 //                            String.format("Read account '%s' from DB [%s]", accName, profileUUID));
-                    LedgerAccount acc = new LedgerAccount(accName);
-                    acc.setHidden(cursor.getInt(1) == 1);
-                    try (Cursor c2 = db.rawQuery(
-                            "SELECT value, currency FROM account_values WHERE profile = ? " +
-                            "AND account = ?", new String[]{profileUUID, acc.getName()}))
-                    {
-                        while (c2.moveToNext()) {
-                            acc.addAmount(c2.getFloat(0), c2.getString(1));
-                        }
-                    }
-                    newList.add(acc);
+                    LedgerAccount acc = profile.loadAccount(db, accName);
+                    if (acc.isVisible(newList)) newList.add(acc);
                 }
             }