From 13a67980d9ebca43719a8eda349c61a8d07f4f01 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Thu, 10 Sep 2020 12:09:28 -0400 Subject: [PATCH] Fix wrong timestamp being used when trimming by length. --- .../org/thoughtcrime/securesms/database/ThreadDatabase.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java index 61bfba6a2..4ace9efa3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java @@ -329,18 +329,16 @@ public class ThreadDatabase extends Database { return; } - long trimDate = trimBeforeDate; - if (length != NO_TRIM_MESSAGE_COUNT_SET) { try (Cursor cursor = DatabaseFactory.getMmsSmsDatabase(context).getConversation(threadId)) { if (cursor != null && length > 0 && cursor.getCount() > length) { cursor.moveToPosition(length - 1); - trimDate = Math.max(trimDate, cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.NORMALIZED_DATE_RECEIVED))); + trimBeforeDate = Math.max(trimBeforeDate, cursor.getLong(cursor.getColumnIndexOrThrow(MmsSmsColumns.NORMALIZED_DATE_RECEIVED))); } } } - if (trimDate != NO_TRIM_BEFORE_DATE_SET) { + if (trimBeforeDate != NO_TRIM_BEFORE_DATE_SET) { Log.i(TAG, "Trimming thread: " + threadId + " before: " + trimBeforeDate); DatabaseFactory.getMmsSmsDatabase(context).deleteMessagesInThreadBeforeDate(threadId, trimBeforeDate);