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

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 ad030ef6..8beab181 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateAccountsTask.java
@@ -20,33 +20,33 @@ package net.ktnx.mobileledger.async;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.AsyncTask;
-import android.util.Log;
 
+import net.ktnx.mobileledger.App;
 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;
 
+import static net.ktnx.mobileledger.utils.Logger.debug;
+
 public class UpdateAccountsTask extends AsyncTask<Void, Void, ArrayList<LedgerAccount>> {
     protected ArrayList<LedgerAccount> doInBackground(Void... params) {
-        Data.backgroundTaskCount.incrementAndGet();
+        Data.backgroundTaskStarted();
         try {
-            MobileLedgerProfile profile = Data.profile.get();
+            MobileLedgerProfile profile = Data.profile.getValue();
+            if (profile == null) throw new AssertionError();
             String profileUUID = profile.getUuid();
-            boolean onlyStarred = Data.optShowOnlyStarred.get();
             ArrayList<LedgerAccount> newList = new ArrayList<>();
 
             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();
+            SQLiteDatabase db = App.getDatabase();
             try (Cursor cursor = db.rawQuery(sql, new String[]{profileUUID})) {
                 while (cursor.moveToNext()) {
                     final String accName = cursor.getString(0);
-//                    Log.d("accounts",
+//                    debug("accounts",
 //                            String.format("Read account '%s' from DB [%s]", accName, profileUUID));
                     LedgerAccount acc = profile.loadAccount(db, accName);
                     if (acc.isVisible(newList)) newList.add(acc);
@@ -56,8 +56,8 @@ public class UpdateAccountsTask extends AsyncTask<Void, Void, ArrayList<LedgerAc
             return newList;
         }
         finally {
-            Log.d("UAT", "decrementing background task count");
-            Data.backgroundTaskCount.decrementAndGet();
+            debug("UAT", "decrementing background task count");
+            Data.backgroundTaskFinished();
         }
     }
 }