remove the day separator at the top of the transaction list

[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 f58d3e5cae25f8f9a06ea4c8b941a3af40cd0af2..042da8ab50db02e8165019300f045c851a6acdc5 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
@@ -24,18 +24,22 @@ import android.util.Log;
 
 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 net.ktnx.mobileledger.utils.MLDB;
 
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 
-public class UpdateTransactionsTask extends AsyncTask<String, Void, List<TransactionListItem>> {
-    protected List<TransactionListItem> doInBackground(String[] filterAccName) {
+public class UpdateTransactionsTask extends AsyncTask<String, Void, String> {
+    protected String doInBackground(String[] filterAccName) {
         Data.backgroundTaskCount.incrementAndGet();
-        String profile_uuid = Data.profile.get().getUuid();
+        final MobileLedgerProfile profile = Data.profile.get();
+        if (profile == null) return "Profile not configured";
+
+        String profile_uuid = profile.getUuid();
         try {
             ArrayList<TransactionListItem> newList = new ArrayList<>();
 
@@ -59,7 +63,8 @@ public class UpdateTransactionsTask extends AsyncTask<String, Void, List<Transac
 
             Log.d("UTT", sql);
             SQLiteDatabase db = MLDB.getReadableDatabase();
-            Date lastDate = null;
+            String lastDateString = Globals.formatLedgerDate(new Date());
+            Date lastDate = Globals.parseLedgerDate(lastDateString);
             boolean odd = true;
             try (Cursor cursor = db.rawQuery(sql, params)) {
                 while (cursor.moveToNext()) {
@@ -69,12 +74,9 @@ public class UpdateTransactionsTask extends AsyncTask<String, Void, List<Transac
                     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(
@@ -82,13 +84,17 @@ public class UpdateTransactionsTask extends AsyncTask<String, Void, List<Transac
 //                    Log.d("UTT", String.format("got transaction %d", transaction_id));
 
                     lastDate = date;
+                    lastDateString = dateString;
                     odd = !odd;
                 }
                 Data.transactions.set(newList);
                 Log.d("UTT", "transaction list value updated");
             }
 
-            return newList;
+            return null;
+        }
+        catch (ParseException e) {
+            return String.format("Error parsing stored date '%s'", e.getMessage());
         }
         finally {
             Data.backgroundTaskCount.decrementAndGet();