From 4bdb367c19ce37aecde2933930a618e989955a8a Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Thu, 15 Apr 2021 10:02:53 -0400
Subject: [PATCH] Fix thumbnail being shown for reaction notifications.

---
 .../notifications/v2/NotificationItemV2.kt       | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationItemV2.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationItemV2.kt
index 1664543014..e7969aa2a3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationItemV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationItemV2.kt
@@ -52,6 +52,7 @@ sealed class NotificationItemV2(val threadRecipient: Recipient, protected val re
   abstract fun getStartingPosition(context: Context): Int
   abstract fun getLargeIconUri(): Uri?
   abstract fun getBigPictureUri(): Uri?
+  abstract fun getThumbnailInfo(): ThumbnailInfo
   abstract fun canReply(context: Context): Boolean
 
   protected fun getMessageContentType(messageRecord: MmsMessageRecord): String {
@@ -125,12 +126,6 @@ sealed class NotificationItemV2(val threadRecipient: Recipient, protected val re
     }
   }
 
-  fun getThumbnailInfo(): ThumbnailInfo {
-    val thumbnailSlide: Slide? = slideDeck?.thumbnailSlide
-
-    return ThumbnailInfo(thumbnailSlide?.publicUri, thumbnailSlide?.contentType)
-  }
-
   fun getInboxLine(context: Context): CharSequence? {
     return when {
       TextSecurePreferences.getNotificationPrivacy(context).isDisplayNothing -> null
@@ -147,7 +142,7 @@ sealed class NotificationItemV2(val threadRecipient: Recipient, protected val re
     }
   }
 
-  data class ThumbnailInfo(val uri: Uri?, val contentType: String?)
+  data class ThumbnailInfo(val uri: Uri? = null, val contentType: String? = null)
 }
 
 /**
@@ -199,6 +194,12 @@ class MessageNotification(threadRecipient: Recipient, record: MessageRecord) : N
     return if (slide?.isInProgress == false) slide.uri else null
   }
 
+  override fun getThumbnailInfo(): ThumbnailInfo {
+    val thumbnailSlide: Slide? = slideDeck?.thumbnailSlide
+
+    return ThumbnailInfo(thumbnailSlide?.publicUri, thumbnailSlide?.contentType)
+  }
+
   override fun canReply(context: Context): Boolean {
     if (KeyCachingService.isLocked(context) ||
       record.isRemoteDelete ||
@@ -284,6 +285,7 @@ class ReactionNotification(threadRecipient: Recipient, record: MessageRecord, va
 
   override fun getLargeIconUri(): Uri? = null
   override fun getBigPictureUri(): Uri? = null
+  override fun getThumbnailInfo(): ThumbnailInfo = ThumbnailInfo()
   override fun canReply(context: Context): Boolean = false
 
   override fun toString(): String {