From bf8f5590a96dfcb5acc179415eb0c6940771c68f Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 10 Jul 2016 20:03:56 -1000 Subject: [PATCH] Fixed issue with certain messages not being deleted on the first day they should be --- .../com/moez/QKSMS/service/DeleteOldMessagesService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/service/DeleteOldMessagesService.java b/QKSMS/src/main/java/com/moez/QKSMS/service/DeleteOldMessagesService.java index 4432348e..f6441b83 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/service/DeleteOldMessagesService.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/service/DeleteOldMessagesService.java @@ -43,6 +43,9 @@ public class DeleteOldMessagesService extends IntentService { private void deleteOldUnreadMessages(Context context) { Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DAY_OF_YEAR, -Integer.parseInt(QKPreferences.getString(QKPreference.AUTO_DELETE_UNREAD))); + calendar.set(Calendar.HOUR_OF_DAY, calendar.getActualMaximum(Calendar.HOUR_OF_DAY)); + calendar.set(Calendar.MINUTE, calendar.getActualMaximum(Calendar.MINUTE)); + calendar.set(Calendar.SECOND, calendar.getActualMaximum(Calendar.SECOND)); int count = deleteOldMessages(context, SmsHelper.UNREAD_SELECTION, calendar.getTimeInMillis()); Log.i(TAG, "Deleted unread messages: " + count); } @@ -50,6 +53,9 @@ public class DeleteOldMessagesService extends IntentService { private void deleteOldReadMessages(Context context) { Calendar calendar = Calendar.getInstance(); calendar.add(Calendar.DAY_OF_YEAR, -Integer.parseInt(QKPreferences.getString(QKPreference.AUTO_DELETE_READ))); + calendar.set(Calendar.HOUR_OF_DAY, calendar.getActualMaximum(Calendar.HOUR_OF_DAY)); + calendar.set(Calendar.MINUTE, calendar.getActualMaximum(Calendar.MINUTE)); + calendar.set(Calendar.SECOND, calendar.getActualMaximum(Calendar.SECOND)); int count = deleteOldMessages(context, SmsHelper.READ_SELECTION + "=" + SmsHelper.READ, calendar.getTimeInMillis()); Log.i(TAG, "Deleted read messages: " + count); }