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=c63dd32cfeb7f1f207acc74ed157871735802d08;hpb=c4cb3dbe89f1789d403058392aec51361ca1ba2f;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 c63dd32c..8beab181 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateAccountsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateAccountsTask.java
@@ -1,18 +1,18 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
* under the term of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.async;
@@ -20,46 +20,44 @@ 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.utils.MLDB;
+import net.ktnx.mobileledger.model.MobileLedgerProfile;
import java.util.ArrayList;
-public class UpdateAccountsTask extends AsyncTask> {
- protected ArrayList doInBackground(Boolean[] onlyStarred) {
- Data.backgroundTaskCount.incrementAndGet();
+import static net.ktnx.mobileledger.utils.Logger.debug;
+
+public class UpdateAccountsTask extends AsyncTask> {
+ protected ArrayList doInBackground(Void... params) {
+ Data.backgroundTaskStarted();
try {
+ MobileLedgerProfile profile = Data.profile.getValue();
+ if (profile == null) throw new AssertionError();
+ String profileUUID = profile.getUuid();
ArrayList newList = new ArrayList<>();
- String sql = "SELECT name, hidden FROM accounts";
- if (onlyStarred[0]) sql += " WHERE hidden = 0";
- sql += " ORDER BY name";
+ String sql = "SELECT a.name from accounts a WHERE a.profile = ?";
+ sql += " ORDER BY a.name";
- SQLiteDatabase db = MLDB.getReadableDatabase();
- try (Cursor cursor = db.rawQuery(sql, null)) {
+ SQLiteDatabase db = App.getDatabase();
+ 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()}))
- {
- while (c2.moveToNext()) {
- acc.addAmount(c2.getFloat(0), c2.getString(1));
- }
- }
- newList.add(acc);
+ final String accName = cursor.getString(0);
+// 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);
}
}
return newList;
}
finally {
- Log.d("UAT", "decrementing background task count");
- Data.backgroundTaskCount.decrementAndGet();
+ debug("UAT", "decrementing background task count");
+ Data.backgroundTaskFinished();
}
}
}