From c0f56397f7912e5a316f19fa36599a4267d9d916 Mon Sep 17 00:00:00 2001 From: Damyan Ivanov Date: Sat, 14 Mar 2020 18:40:40 +0200 Subject: [PATCH] omit use of deprecated Date.getYear() and Date.getMonth() --- .../mobileledger/async/UpdateTransactionsTask.java | 14 ++++++++------ .../java/net/ktnx/mobileledger/utils/Globals.java | 6 ++++++ 2 files changed, 14 insertions(+), 6 deletions(-) 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..815f37fe 100644 --- a/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java +++ b/app/src/main/java/net/ktnx/mobileledger/async/UpdateTransactionsTask.java @@ -65,20 +65,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)); diff --git a/app/src/main/java/net/ktnx/mobileledger/utils/Globals.java b/app/src/main/java/net/ktnx/mobileledger/utils/Globals.java index 56a88cec..fe0cbe08 100644 --- a/app/src/main/java/net/ktnx/mobileledger/utils/Globals.java +++ b/app/src/main/java/net/ktnx/mobileledger/utils/Globals.java @@ -82,6 +82,12 @@ public final class Globals { return dateFormatter.get().parse(toParse); } + public static Calendar parseLedgerDateAsCalendar(String dateString) throws ParseException { + Date date = parseLedgerDate(dateString); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + return calendar; + } public static Date parseIsoDate(String dateString) throws ParseException { return isoDateFormatter.get().parse(dateString); } -- 2.39.2