Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 00:59:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure lower api levels do not try to use Uri based IconCompat.

Browse Source
This commit is contained in:
Alex Hart
2023-09-11 15:27:58 -03:00
committed by GitHub
parent b72fe0d7a2
commit 18b33a7776
6 changed files with 119 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -274,7 +274,7 @@ sealed class NotificationBuilder(protected val context: Context) {
val self: PersonCompat = PersonCompat.Builder()
.setBot(false)
.setName(if (includeShortcut) Recipient.self().getDisplayName(context) else context.getString(R.string.SingleRecipientNotificationBuilder_you))
.setIcon(AvatarUtil.getIconWithUriForNotification(Recipient.self().id))
.setIcon(AvatarUtil.getIconCompat(context, Recipient.self()))
.setKey(ConversationUtil.getShortcutId(Recipient.self().id))
.build()
@@ -290,7 +290,7 @@ sealed class NotificationBuilder(protected val context: Context) {
.setBot(false)
.setName(notificationItem.getPersonName(context))
.setUri(notificationItem.getPersonUri())
.setIcon(notificationItem.getPersonIcon())
.setIcon(notificationItem.getPersonIcon(context))
if (includeShortcut) {
personBuilder.setKey(ConversationUtil.getShortcutId(notificationItem.authorRecipient))
@@ -360,7 +360,7 @@ sealed class NotificationBuilder(protected val context: Context) {
)
if (intent != null) {
val bubbleMetadata = NotificationCompat.BubbleMetadata.Builder(intent, AvatarUtil.getIconCompatForShortcut(context, conversation.recipient))
val bubbleMetadata = NotificationCompat.BubbleMetadata.Builder(intent, AvatarUtil.getIconCompat(context, conversation.recipient))
.setAutoExpandBubble(bubbleState === BubbleUtil.BubbleState.SHOWN)
.setDesiredHeight(600)
.setSuppressNotification(bubbleState === BubbleUtil.BubbleState.SHOWN)

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

@@ -123,9 +123,9 @@ sealed class NotificationItem(val threadRecipient: Recipient, protected val reco
}
}
fun getPersonIcon(): IconCompat? {
fun getPersonIcon(context: Context): IconCompat? {
return if (SignalStore.settings().messageNotificationsPrivacy.isDisplayContact) {
AvatarUtil.getIconWithUriForNotification(authorRecipient.id)
AvatarUtil.getIconCompat(context, authorRecipient)
} else {
null
}