Fix notification thumbnail being shown when content should be hidden.

app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationBuilder.kt

@@ -241,7 +241,7 @@ sealed class NotificationBuilder(protected val context: Context) {
           .setUri(notificationItem.getPersonUri(context))
           .setIcon(notificationItem.getPersonIcon(context).toIconCompat())
 
-        val (dataUri: Uri?, mimeType: String?) = notificationItem.getThumbnailInfo()
+        val (dataUri: Uri?, mimeType: String?) = notificationItem.getThumbnailInfo(context)
 
         messagingStyle.addMessage(NotificationCompat.MessagingStyle.Message(notificationItem.getPrimaryText(context), notificationItem.timestamp, personBuilder.build()).setData(mimeType, dataUri))
       }
@@ -477,7 +477,7 @@ sealed class NotificationBuilder(protected val context: Context) {
           .setUri(notificationItem.getPersonUri(context))
           .setIcon(notificationItem.getPersonIcon(context).toIcon())
 
-        val (dataUri: Uri?, mimeType: String?) = notificationItem.getThumbnailInfo()
+        val (dataUri: Uri?, mimeType: String?) = notificationItem.getThumbnailInfo(context)
 
         messagingStyle.addMessage(Notification.MessagingStyle.Message(notificationItem.getPrimaryText(context), notificationItem.timestamp, personBuilder.build()).setData(mimeType, dataUri))
       }

app/src/main/java/org/thoughtcrime/securesms/notifications/v2/NotificationItemV2.kt

@@ -52,7 +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 getThumbnailInfo(context: Context): ThumbnailInfo
   abstract fun canReply(context: Context): Boolean
 
   protected fun getMessageContentType(messageRecord: MmsMessageRecord): String {
@@ -194,10 +194,13 @@ 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 getThumbnailInfo(context: Context): ThumbnailInfo {
+    return if (TextSecurePreferences.getNotificationPrivacy(context).isDisplayMessage) {
+      val thumbnailSlide: Slide? = slideDeck?.thumbnailSlide
+      ThumbnailInfo(thumbnailSlide?.publicUri, thumbnailSlide?.contentType)
+    } else {
+      ThumbnailInfo()
+    }
   }
 
   override fun canReply(context: Context): Boolean {
@@ -285,7 +288,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 getThumbnailInfo(context: Context): ThumbnailInfo = ThumbnailInfo()
   override fun canReply(context: Context): Boolean = false
 
   override fun toString(): String {