Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-22 20:18:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix notification thumbnail being shown when content should be hidden.

Browse Source
This commit is contained in:
Cody Henthorne
2021-04-15 10:24:06 -04:00
parent 4bdb367c19
commit 69ebee3eeb
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -241,7 +241,7 @@ sealed class NotificationBuilder(protected val context: Context) {
.setUri(notificationItem.getPersonUri(context)) .setUri(notificationItem.getPersonUri(context))
.setIcon(notificationItem.getPersonIcon(context).toIconCompat()) .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)) 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)) .setUri(notificationItem.getPersonUri(context))
.setIcon(notificationItem.getPersonIcon(context).toIcon()) .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)) messagingStyle.addMessage(Notification.MessagingStyle.Message(notificationItem.getPrimaryText(context), notificationItem.timestamp, personBuilder.build()).setData(mimeType, dataUri))
} }

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

@@ -52,7 +52,7 @@ sealed class NotificationItemV2(val threadRecipient: Recipient, protected val re
abstract fun getStartingPosition(context: Context): Int abstract fun getStartingPosition(context: Context): Int
abstract fun getLargeIconUri(): Uri? abstract fun getLargeIconUri(): Uri?
abstract fun getBigPictureUri(): Uri? abstract fun getBigPictureUri(): Uri?
abstract fun getThumbnailInfo(): ThumbnailInfo abstract fun getThumbnailInfo(context: Context): ThumbnailInfo
abstract fun canReply(context: Context): Boolean abstract fun canReply(context: Context): Boolean
protected fun getMessageContentType(messageRecord: MmsMessageRecord): String { 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 return if (slide?.isInProgress == false) slide.uri else null
} }
override fun getThumbnailInfo(): ThumbnailInfo { override fun getThumbnailInfo(context: Context): ThumbnailInfo {
return if (TextSecurePreferences.getNotificationPrivacy(context).isDisplayMessage) {
val thumbnailSlide: Slide? = slideDeck?.thumbnailSlide val thumbnailSlide: Slide? = slideDeck?.thumbnailSlide
ThumbnailInfo(thumbnailSlide?.publicUri, thumbnailSlide?.contentType)
return ThumbnailInfo(thumbnailSlide?.publicUri, thumbnailSlide?.contentType) } else {
ThumbnailInfo()
}
} }
override fun canReply(context: Context): Boolean { override fun canReply(context: Context): Boolean {
@@ -285,7 +288,7 @@ class ReactionNotification(threadRecipient: Recipient, record: MessageRecord, va
override fun getLargeIconUri(): Uri? = null override fun getLargeIconUri(): Uri? = null
override fun getBigPictureUri(): 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 canReply(context: Context): Boolean = false
override fun toString(): String { override fun toString(): String {