X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FUpdateTransactionsTask.java;h=38db6b17f8c7b30648a92d980f23626f4fbe222e;hb=63d4636c19652b688fb0a1e4f3081843c740bf78;hp=0509f3531cd887236c7c61778d692635ed4709f5;hpb=a1d55154e1c9fb72fcd60de31d6e64e8d046f96d;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 0509f353..38db6b17 100644
--- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
@@ -1,73 +1,81 @@
 /*
- * 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 © 2021 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 <https://www.gnu.org/licenses/>.
+ * along with MoLe. If not, see <https://www.gnu.org/licenses/>.
  */
 
 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.db.DB;
+import net.ktnx.mobileledger.db.Profile;
+import net.ktnx.mobileledger.db.TransactionWithAccounts;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerTransaction;
-import net.ktnx.mobileledger.utils.MLDB;
+import net.ktnx.mobileledger.ui.MainModel;
+import net.ktnx.mobileledger.utils.Logger;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class UpdateTransactionsTask extends AsyncTask<String, Void, List<LedgerTransaction>> {
-    protected List<LedgerTransaction> doInBackground(String[] filterAccName) {
-        Data.backgroundTaskCount.incrementAndGet();
-        try {
-            ArrayList<LedgerTransaction> newList = new ArrayList<>();
+import static net.ktnx.mobileledger.db.Profile.NO_PROFILE_ID;
+import static net.ktnx.mobileledger.utils.Logger.debug;
 
-            boolean hasFilter = (filterAccName != null) && (filterAccName.length > 0) &&
-                                (filterAccName[0] != null) && !filterAccName[0].isEmpty();
+public class UpdateTransactionsTask extends AsyncTask<MainModel, Void, String> {
+    protected String doInBackground(MainModel[] parentModel) {
+        final Profile profile = Data.getProfile();
 
-            String sql;
-            String[] params;
+        long profileId = (profile == null) ? NO_PROFILE_ID : profile.getId();
+        Data.backgroundTaskStarted();
+        try {
+            Logger.debug("UTT", "Starting DB transaction list retrieval");
 
-            sql = "SELECT id FROM transactions  ORDER BY date desc, id desc";
-            params = null;
+            final MainModel model = parentModel[0];
+            final String accFilter = model.getAccountFilter()
+                                          .getValue();
+            final List<TransactionWithAccounts> transactions;
 
-            if (hasFilter) {
-                sql = "SELECT distinct tr.id from transactions tr JOIN transaction_accounts ta " +
-                      "ON ta.transaction_id=tr.id WHERE ta.account_name LIKE ?||'%' AND ta" +
-                      ".amount <> 0 ORDER BY tr.date desc, tr.id desc";
-                params = filterAccName;
+            if (profileId == NO_PROFILE_ID)
+                transactions = new ArrayList<>();
+            else if (accFilter == null) {
+                transactions = DB.get()
+                                 .getTransactionDAO()
+                                 .getAllWithAccountsSync(profileId);
+            }
+            else {
+                transactions = DB.get()
+                                 .getTransactionDAO()
+                                 .getAllWithAccountsFilteredSync(profileId, accFilter);
             }
 
-            Log.d("tmp", sql);
-            try (SQLiteDatabase db = MLDB.getReadableDatabase()) {
-                try (Cursor cursor = db.rawQuery(sql, params)) {
-                    while (cursor.moveToNext()) {
-                        if (isCancelled()) return null;
+            TransactionAccumulator accumulator = new TransactionAccumulator(model);
 
-                        newList.add(new LedgerTransaction(cursor.getInt(0)));
-                    }
-                    Data.transactions.set(newList);
-                    Log.d("transactions", "transaction value updated");
-                }
+            for (TransactionWithAccounts tr : transactions) {
+                if (isCancelled())
+                    return null;
+
+                accumulator.put(new LedgerTransaction(tr));
             }
 
-            return newList;
+            accumulator.done();
+            debug("UTT", "transaction list value updated");
+
+            return null;
         }
         finally {
-            Data.backgroundTaskCount.decrementAndGet();
+            Data.backgroundTaskFinished();
         }
     }
 }