X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FUpdateTransactionsTask.java;h=43de74025ad83ca7dc8dd511080dcc60d2d3c55c;hb=f973784f579d42988174acf0b24593aa23180fa6;hp=22511560679e9c9e192f98b3cd1c74df292add00;hpb=3b365016042215dd73cb4600840aa8199b8322b9;p=mobile-ledger.git
diff --git a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
index 22511560..43de7402 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.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
+ * Copyright © 2020 Damyan Ivanov.
+ * 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,57 +20,65 @@ 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.LedgerTransaction;
-import net.ktnx.mobileledger.utils.MLDB;
+import net.ktnx.mobileledger.model.MobileLedgerProfile;
+import net.ktnx.mobileledger.ui.MainModel;
+import net.ktnx.mobileledger.utils.SimpleDate;
-import java.util.ArrayList;
-import java.util.List;
+import static net.ktnx.mobileledger.utils.Logger.debug;
-public class UpdateTransactionsTask extends AsyncTask> {
- protected List doInBackground(String[] filterAccName) {
- Data.backgroundTaskCount.incrementAndGet();
- String profile_uuid = Data.profile.get().getUuid();
- try {
- ArrayList newList = new ArrayList<>();
-
- boolean hasFilter = (filterAccName != null) && (filterAccName.length > 0) &&
- (filterAccName[0] != null) && !filterAccName[0].isEmpty();
+public class UpdateTransactionsTask extends AsyncTask {
+ protected String doInBackground(MainModel[] model) {
+ final MobileLedgerProfile profile = Data.getProfile();
+ String profile_uuid = profile.getUuid();
+ Data.backgroundTaskStarted();
+ try {
String sql;
String[] params;
- sql = "SELECT id FROM transactions WHERE profile=? ORDER BY date desc, id desc";
- params = new String[]{profile_uuid};
+ final String accFilter = model[0].getAccountFilter()
+ .getValue();
+ if (accFilter == null) {
+ sql = "SELECT id, year, month, day FROM transactions WHERE profile=? ORDER BY " +
+ "year desc, month desc, day desc, id desc";
+ params = new String[]{profile_uuid};
- if (hasFilter) {
- sql = "SELECT distinct tr.id from transactions tr JOIN transaction_accounts ta " +
+ }
+ else {
+ sql = "SELECT distinct tr.id, tr.year, tr.month, tr.day from transactions tr " +
+ "JOIN " + "transaction_accounts ta " +
"ON ta.transaction_id=tr.id AND ta.profile=tr.profile WHERE tr.profile=? " +
- "and ta" + ".account_name LIKE ?||'%' AND ta" +
- ".amount <> 0 ORDER BY tr.date desc, tr.id desc";
- params = filterAccName;
+ "and ta.account_name LIKE ?||'%' AND ta" +
+ ".amount <> 0 ORDER BY tr.year desc, tr.month desc, tr.day desc, tr.id " +
+ "desc";
+ params = new String[]{profile_uuid, accFilter};
}
- Log.d("UTT", sql);
- SQLiteDatabase db = MLDB.getReadableDatabase();
+ debug("UTT", sql);
+ TransactionAccumulator accumulator = new TransactionAccumulator(model[0]);
+
+ SQLiteDatabase db = App.getDatabase();
try (Cursor cursor = db.rawQuery(sql, params)) {
while (cursor.moveToNext()) {
- if (isCancelled()) return null;
+ if (isCancelled())
+ return null;
- int transaction_id = cursor.getInt(0);
- newList.add(new LedgerTransaction(transaction_id));
- Log.d("UTT", String.format("got transaction %d", transaction_id));
+ accumulator.put(new LedgerTransaction(cursor.getInt(0)),
+ new SimpleDate(cursor.getInt(1), cursor.getInt(2), cursor.getInt(3)));
}
- Data.transactions.set(newList);
- Log.d("UTT", "transaction list value updated");
}
- return newList;
+ accumulator.done();
+ debug("UTT", "transaction list value updated");
+
+ return null;
}
finally {
- Data.backgroundTaskCount.decrementAndGet();
+ Data.backgroundTaskFinished();
}
}
}