Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Move call to setGroup to configureWith

Browse source
This commit is contained in:
Benoit Marty 2025-10-27 12:32:36 +01:00 • committed by Benoit Marty
parent 31ff72b319
commit 947347b3f1
1 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/NotificationCreator.kt
View file

@ -155,9 +155,6 @@ class DefaultNotificationCreator(
setShortcutId(createShortcutId(roomInfo.sessionId, roomInfo.roomId)) setShortcutId(createShortcutId(roomInfo.sessionId, roomInfo.roomId))
} }
} }
// Auto-bundling is enabled for 4 or more notifications on API 24+ (N+)
// devices and all Wear devices. But we want a custom grouping, so we specify the groupID
.setGroup(roomInfo.sessionId.value)
.setGroupSummary(false) .setGroupSummary(false)
// In order to avoid notification making sound twice (due to the summary notification) // In order to avoid notification making sound twice (due to the summary notification)
.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN) .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN)
@ -236,7 +233,6 @@ class DefaultNotificationCreator(
.setOnlyAlertOnce(true) .setOnlyAlertOnce(true)
.setContentTitle((inviteNotifiableEvent.roomName ?: buildMeta.applicationName).annotateForDebug(5)) .setContentTitle((inviteNotifiableEvent.roomName ?: buildMeta.applicationName).annotateForDebug(5))
.setContentText(inviteNotifiableEvent.description.annotateForDebug(6)) .setContentText(inviteNotifiableEvent.description.annotateForDebug(6))
.setGroup(inviteNotifiableEvent.sessionId.value)
.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_ALL) .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_ALL)
.configureWith(notificationAccountParams) .configureWith(notificationAccountParams)
.apply { .apply {
@ -277,7 +273,6 @@ class DefaultNotificationCreator(
.setOnlyAlertOnce(true) .setOnlyAlertOnce(true)
.setContentTitle(buildMeta.applicationName.annotateForDebug(7)) .setContentTitle(buildMeta.applicationName.annotateForDebug(7))
.setContentText(simpleNotifiableEvent.description.annotateForDebug(8)) .setContentText(simpleNotifiableEvent.description.annotateForDebug(8))
.setGroup(simpleNotifiableEvent.sessionId.value)
.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_ALL) .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_ALL)
.configureWith(notificationAccountParams) .configureWith(notificationAccountParams)
.setAutoCancel(true) .setAutoCancel(true)
@ -308,7 +303,6 @@ class DefaultNotificationCreator(
.setOnlyAlertOnce(true) .setOnlyAlertOnce(true)
.setContentTitle(buildMeta.applicationName.annotateForDebug(7)) .setContentTitle(buildMeta.applicationName.annotateForDebug(7))
.setContentText(fallbackNotifiableEvent.description.orEmpty().annotateForDebug(8)) .setContentText(fallbackNotifiableEvent.description.orEmpty().annotateForDebug(8))
.setGroup(fallbackNotifiableEvent.sessionId.value)
.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_ALL) .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_ALL)
.configureWith(notificationAccountParams) .configureWith(notificationAccountParams)
.setAutoCancel(true) .setAutoCancel(true)
@ -343,7 +337,6 @@ class DefaultNotificationCreator(
// used in compat < N, after summary is built based on child notifications // used in compat < N, after summary is built based on child notifications
.setWhen(lastMessageTimestamp) .setWhen(lastMessageTimestamp)
.setCategory(NotificationCompat.CATEGORY_MESSAGE) .setCategory(NotificationCompat.CATEGORY_MESSAGE)
.setGroup(userId.value)
// set this notification as the summary for the group // set this notification as the summary for the group
.setGroupSummary(true) .setGroupSummary(true)
.configureWith(notificationAccountParams) .configureWith(notificationAccountParams)
@ -476,6 +469,7 @@ class DefaultNotificationCreator(
private fun NotificationCompat.Builder.configureWith(notificationAccountParams: NotificationAccountParams) = apply { private fun NotificationCompat.Builder.configureWith(notificationAccountParams: NotificationAccountParams) = apply {
setSmallIcon(CommonDrawables.ic_notification) setSmallIcon(CommonDrawables.ic_notification)
setColor(notificationAccountParams.color) setColor(notificationAccountParams.color)
setGroup(notificationAccountParams.user.userId.value)
if (notificationAccountParams.showSessionId) { if (notificationAccountParams.showSessionId) {
setSubText(notificationAccountParams.user.userId.value) setSubText(notificationAccountParams.user.userId.value)
} }