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=250214d63dacd90d676fc8e3a38a8080fb172092;hp=458c1af6463bff838f387dfa78ccae37d179c393;hb=b4175624de863c7343de10db2436722e78e51cb1;hpb=ffbfe16379b73aaf0bc68b4251c2acb930a19d26

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 458c1af6..250214d6 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateAccountsTask.java
@@ -28,24 +28,26 @@ import net.ktnx.mobileledger.utils.MLDB;
 
 import java.util.ArrayList;
 
-public class UpdateAccountsTask extends AsyncTask<Boolean, Void, ArrayList<LedgerAccount>> {
-    protected ArrayList<LedgerAccount> doInBackground(Boolean[] onlyStarred) {
+public class UpdateAccountsTask extends AsyncTask<Void, Void, ArrayList<LedgerAccount>> {
+    protected ArrayList<LedgerAccount> doInBackground(Void... params) {
         Data.backgroundTaskCount.incrementAndGet();
+        String profileUUID = Data.profile.get().getUuid();
+        boolean onlyStarred = Data.optShowOnlyStarred.get();
         try {
             ArrayList<LedgerAccount> newList = new ArrayList<>();
 
-            String sql = "SELECT name, hidden FROM accounts";
-            if (onlyStarred[0]) sql += " WHERE hidden = 0";
+            String sql = "SELECT name, hidden FROM accounts WHERE profile = ?";
+            if (onlyStarred) sql += " AND hidden = 0";
             sql += " ORDER BY name";
 
             SQLiteDatabase db = MLDB.getReadableDatabase();
-            try (Cursor cursor = db.rawQuery(sql, null)) {
+            try (Cursor cursor = db.rawQuery(sql, new String[]{profileUUID})) {
                 while (cursor.moveToNext()) {
                     LedgerAccount acc = new LedgerAccount(cursor.getString(0));
                     acc.setHidden(cursor.getInt(1) == 1);
                     try (Cursor c2 = db.rawQuery(
-                            "SELECT value, currency FROM account_values " + "WHERE account = ?",
-                            new String[]{acc.getName()}))
+                            "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));
@@ -55,8 +57,6 @@ public class UpdateAccountsTask extends AsyncTask<Boolean, Void, ArrayList<Ledge
                 }
             }
 
-            Data.accounts.set(newList);
-
             return newList;
         }
         finally {