fu: Date → Calendar

[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 dc6536a167c58c74b5792dd0a4aee5d8b760f88e..545aec36ec4cec6427b36e77b4d2585fd4c80259 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
+++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java
@@ -21,22 +21,23 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.AsyncTask;
 
+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 net.ktnx.mobileledger.utils.MLDB;
 
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 
 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.get();
+        final MobileLedgerProfile profile = Data.profile.getValue();
         if (profile == null) return "Profile not configured";
 
         String profile_uuid = profile.getUuid();
@@ -63,22 +64,24 @@ public class UpdateTransactionsTask extends AsyncTask<String, Void, String> {
             }
 
             debug("UTT", sql);
-            SQLiteDatabase db = MLDB.getDatabase();
+            SQLiteDatabase db = App.getDatabase();
             String lastDateString = Globals.formatLedgerDate(new Date());
-            Date lastDate = Globals.parseLedgerDate(lastDateString);
+            Calendar lastDate = Globals.parseLedgerDateAsCalendar(lastDateString);
             boolean odd = true;
             try (Cursor cursor = db.rawQuery(sql, params)) {
                 while (cursor.moveToNext()) {
-                    if (isCancelled()) return null;
+                    if (isCancelled())
+                        return null;
 
                     int transaction_id = cursor.getInt(0);
                     String dateString = cursor.getString(1);
-                    Date date = Globals.parseLedgerDate(dateString);
+                    Calendar date = Globals.parseLedgerDateAsCalendar(dateString);
 
                     if (!lastDateString.equals(dateString)) {
-                        boolean showMonth = (date.getMonth() != lastDate.getMonth() ||
-                                             date.getYear() != lastDate.getYear());
-                        newList.add(new TransactionListItem(date, showMonth));
+                        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));