From dcf8a82c37fe04bc8b7f412b1ab7fd193fa034c2 Mon Sep 17 00:00:00 2001 From: Cody Henthorne Date: Tue, 17 Jan 2023 15:00:19 -0500 Subject: [PATCH] Fix no snippet being shown for threads. Snippet query wasn't updated to exclude SMS types after the conjuction of the tables. --- .../org/thoughtcrime/securesms/database/MessageTable.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.java index 54cde3881c..214d0f53ba 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.java @@ -335,7 +335,11 @@ public class MessageTable extends DatabaseTable implements MessageTypes, Recipie private static final String RAW_ID_WHERE = TABLE_NAME + "._id = ?"; private static final String SNIPPET_QUERY = "SELECT " + MessageTable.ID + ", " + MessageTable.TYPE + ", " + MessageTable.DATE_RECEIVED + " FROM " + MessageTable.TABLE_NAME + " " + - "WHERE " + MessageTable.THREAD_ID + " = ? AND " + MessageTable.TYPE + " & " + MessageTypes.GROUP_V2_LEAVE_BITS + " != " + MessageTypes.GROUP_V2_LEAVE_BITS + " AND " + MessageTable.STORY_TYPE + " = 0 AND " + MessageTable.PARENT_STORY_ID + " <= 0 " + + "WHERE " + MessageTable.THREAD_ID + " = ? AND " + + MessageTable.TYPE + " & " + MessageTypes.GROUP_V2_LEAVE_BITS + " != " + MessageTypes.GROUP_V2_LEAVE_BITS + " AND " + + MessageTable.STORY_TYPE + " = 0 AND " + + MessageTable.PARENT_STORY_ID + " <= 0 AND " + + MessageTable.TYPE + " NOT IN (" + MessageTypes.PROFILE_CHANGE_TYPE + ", " + MessageTypes.GV1_MIGRATION_TYPE + ", " + MessageTypes.CHANGE_NUMBER_TYPE + ", " + MessageTypes.BOOST_REQUEST_TYPE + ", " + MessageTypes.SMS_EXPORT_TYPE + ") " + "ORDER BY " + MessageTable.DATE_RECEIVED + " DESC " + "LIMIT 1";