replace assertions with good old if()

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / async / UpdateAccountsTask.java

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 65f272220557501c2a9dc37fd0b24f741e2e699a..667bf99809f6e29f6da971651f70cd5e673e4823 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateAccountsTask.java
@@ -20,20 +20,22 @@ 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<>();
@@ -42,11 +44,11 @@ public class UpdateAccountsTask extends AsyncTask<Void, Void, ArrayList<LedgerAc
             if (onlyStarred) sql += " AND a.hidden = 0";
             sql += " ORDER BY a.name";
 
-            SQLiteDatabase db = MLDB.getDatabase();
+            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 +58,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();
         }
     }
 }