X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fasync%2FUpdateTransactionsTask.java;h=1152cdeaeef3a036c7e0b2b59a20da06e4c7588e;hb=c573b352226ba1dadb779bdc27df888b9fa23fde;hp=5093d50c952287846284c1390e07da2259453b23;hpb=90383a155ec16a9f13b1e6ac94a118033e09b3aa;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 5093d50c..1152cdea 100644 --- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java +++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java @@ -30,6 +30,7 @@ import net.ktnx.mobileledger.utils.Globals; import java.text.ParseException; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import static net.ktnx.mobileledger.utils.Logger.debug; @@ -37,7 +38,8 @@ import static net.ktnx.mobileledger.utils.Logger.debug; public class UpdateTransactionsTask extends AsyncTask { protected String doInBackground(String[] filterAccName) { final MobileLedgerProfile profile = Data.profile.getValue(); - if (profile == null) return "Profile not configured"; + if (profile == null) + return "Profile not configured"; String profile_uuid = profile.getUuid(); Data.backgroundTaskStarted(); @@ -65,20 +67,22 @@ public class UpdateTransactionsTask extends AsyncTask { debug("UTT", sql); 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));