From cae5dad5d80a512ba84f6bb596275baf3e6b8d75 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 4 Nov 2021 10:46:36 -0400 Subject: [PATCH] Guard against missing recipientIds in the media overview. --- .../org/thoughtcrime/securesms/database/MediaDatabase.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java index fd2bd6b8a..2c67c11f4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MediaDatabase.java @@ -65,7 +65,9 @@ public class MediaDatabase extends Database { + MmsDatabase.VIEW_ONCE + " = 0 AND " + AttachmentDatabase.DATA + " IS NOT NULL AND " + "(" + AttachmentDatabase.QUOTE + " = 0 OR (" + AttachmentDatabase.QUOTE + " = 1 AND " + AttachmentDatabase.DATA_HASH + " IS NULL)) AND " - + AttachmentDatabase.STICKER_PACK_ID + " IS NULL "; + + AttachmentDatabase.STICKER_PACK_ID + " IS NULL AND " + + MmsDatabase.RECIPIENT_ID + " > 0 AND " + + THREAD_RECIPIENT_ID + " > 0"; private static final String UNIQUE_MEDIA_QUERY = "SELECT " + "MAX(" + AttachmentDatabase.SIZE + ") as " + AttachmentDatabase.SIZE + ", "