remove the distinction between "readable" and "writable" database connections

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

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 0f3d022ad785905a004d337f3f7233ca02ee72c7..fb1bd72fd2a359c790e6611a83fe15ad827847a1 100644 (file)
--- 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
+ * 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;
@@ -35,11 +35,11 @@ import java.util.Date;
 
 public class UpdateTransactionsTask extends AsyncTask<String, Void, String> {
     protected String doInBackground(String[] filterAccName) {
-        Data.backgroundTaskCount.incrementAndGet();
         final MobileLedgerProfile profile = Data.profile.get();
         if (profile == null) return "Profile not configured";
 
         String profile_uuid = profile.getUuid();
+        Data.backgroundTaskCount.incrementAndGet();
         try {
             ArrayList<TransactionListItem> newList = new ArrayList<>();
 
@@ -62,8 +62,9 @@ public class UpdateTransactionsTask extends AsyncTask<String, Void, String> {
             }
 
             Log.d("UTT", sql);
-            SQLiteDatabase db = MLDB.getReadableDatabase();
-            Date lastDate = null;
+            SQLiteDatabase db = MLDB.getDatabase();
+            String lastDateString = Globals.formatLedgerDate(new Date());
+            Date lastDate = Globals.parseLedgerDate(lastDateString);
             boolean odd = true;
             try (Cursor cursor = db.rawQuery(sql, params)) {
                 while (cursor.moveToNext()) {
@@ -73,12 +74,9 @@ public class UpdateTransactionsTask extends AsyncTask<String, Void, String> {
                     String dateString = cursor.getString(1);
                     Date date = Globals.parseLedgerDate(dateString);
 
-                    if ((lastDate == null) || !lastDate.equals(date)) {
-                        boolean showMonth = (lastDate == null) || (date != null) &&
-                                                                  (date.getMonth() !=
-                                                                   lastDate.getMonth() ||
-                                                                   date.getYear() !=
-                                                                   lastDate.getYear());
+                    if (!lastDateString.equals(dateString)) {
+                        boolean showMonth = (date.getMonth() != lastDate.getMonth() ||
+                                             date.getYear() != lastDate.getYear());
                         newList.add(new TransactionListItem(date, showMonth));
                     }
                     newList.add(
@@ -86,6 +84,7 @@ public class UpdateTransactionsTask extends AsyncTask<String, Void, String> {
 //                    Log.d("UTT", String.format("got transaction %d", transaction_id));
 
                     lastDate = date;
+                    lastDateString = dateString;
                     odd = !odd;
                 }
                 Data.transactions.set(newList);