X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FUpdateTransactionsTask.java;h=43de74025ad83ca7dc8dd511080dcc60d2d3c55c;hb=5bba2c06a81c87327fdcf3f2a85c3206d932c2f9;hp=545aec36ec4cec6427b36e77b4d2585fd4c80259;hpb=73c4c4ca18b426795e582c1d6012f3893d80c8c9;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 545aec36..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,5 +1,5 @@
 /*
- * Copyright © 2019 Damyan Ivanov.
+ * 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
@@ -25,81 +25,58 @@ import net.ktnx.mobileledger.App;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerTransaction;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
-import net.ktnx.mobileledger.model.TransactionListItem;
-import net.ktnx.mobileledger.utils.Globals;
-
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
+import net.ktnx.mobileledger.ui.MainModel;
+import net.ktnx.mobileledger.utils.SimpleDate;
 
 import static net.ktnx.mobileledger.utils.Logger.debug;
 
-public class UpdateTransactionsTask extends AsyncTask<String, Void, String> {
-    protected String doInBackground(String[] filterAccName) {
-        final MobileLedgerProfile profile = Data.profile.getValue();
-        if (profile == null) return "Profile not configured";
+public class UpdateTransactionsTask extends AsyncTask<MainModel, Void, String> {
+    protected String doInBackground(MainModel[] model) {
+        final MobileLedgerProfile profile = Data.getProfile();
 
         String profile_uuid = profile.getUuid();
         Data.backgroundTaskStarted();
         try {
-            ArrayList<TransactionListItem> newList = new ArrayList<>();
-
             String sql;
             String[] params;
 
-            if (filterAccName[0] == null) {
-                sql = "SELECT id, date FROM transactions WHERE profile=? ORDER BY date desc, id " +
-                      "desc";
+            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};
 
             }
             else {
-                sql = "SELECT distinct tr.id, tr.date from transactions tr JOIN " +
-                      "transaction_accounts ta " +
+                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 = new String[]{profile_uuid, filterAccName[0]};
+                      ".amount <> 0 ORDER BY tr.year desc, tr.month desc, tr.day desc, tr.id " +
+                      "desc";
+                params = new String[]{profile_uuid, accFilter};
             }
 
             debug("UTT", sql);
+            TransactionAccumulator accumulator = new TransactionAccumulator(model[0]);
+
             SQLiteDatabase db = App.getDatabase();
-            String lastDateString = Globals.formatLedgerDate(new Date());
-            Calendar lastDate = Globals.parseLedgerDateAsCalendar(lastDateString);
-            boolean odd = true;
             try (Cursor cursor = db.rawQuery(sql, params)) {
                 while (cursor.moveToNext()) {
                     if (isCancelled())
                         return null;
 
-                    int transaction_id = cursor.getInt(0);
-                    String dateString = cursor.getString(1);
-                    Calendar date = Globals.parseLedgerDateAsCalendar(dateString);
-
-                    if (!lastDateString.equals(dateString)) {
-                        boolean showMonth =
-                                (date.get(Calendar.MONTH) != lastDate.get(Calendar.MONTH)) ||
-                                (date.get(Calendar.YEAR) != lastDate.get(Calendar.YEAR));
-                        newList.add(new TransactionListItem(date.getTime(), showMonth));
-                    }
-                    newList.add(
-                            new TransactionListItem(new LedgerTransaction(transaction_id), odd));
-//                    debug("UTT", String.format("got transaction %d", transaction_id));
-
-                    lastDate = date;
-                    lastDateString = dateString;
-                    odd = !odd;
+                    accumulator.put(new LedgerTransaction(cursor.getInt(0)),
+                            new SimpleDate(cursor.getInt(1), cursor.getInt(2), cursor.getInt(3)));
                 }
-                Data.transactions.setList(newList);
-                debug("UTT", "transaction list value updated");
             }
 
+            accumulator.done();
+            debug("UTT", "transaction list value updated");
+
             return null;
         }
-        catch (ParseException e) {
-            return String.format("Error parsing stored date '%s'", e.getMessage());
-        }
         finally {
             Data.backgroundTaskFinished();
         }