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

Introduce createShortcutId to enforce the same computation of shortcut ids.

Browse source 
Fixes https://github.com/element-hq/element-x-android/pull/5192#discussion_r2326482795
This commit is contained in:
Benoit Marty 2025-09-09 08:59:57 +02:00
parent ef738a4210
commit a6f3a16d5f
3 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/conversations/DefaultNotificationConversationService.kt
View file

@ -33,6 +33,7 @@ import io.element.android.libraries.matrix.ui.media.InitialsAvatarBitmapGenerato
import io.element.android.libraries.push.api.notifications.NotificationBitmapLoader import io.element.android.libraries.push.api.notifications.NotificationBitmapLoader
import io.element.android.libraries.push.api.notifications.conversations.NotificationConversationService import io.element.android.libraries.push.api.notifications.conversations.NotificationConversationService
import io.element.android.libraries.push.impl.intent.IntentProvider import io.element.android.libraries.push.impl.intent.IntentProvider
import io.element.android.libraries.push.impl.notifications.shortcut.createShortcutId
import io.element.android.libraries.sessionstorage.api.observer.SessionListener import io.element.android.libraries.sessionstorage.api.observer.SessionListener
import io.element.android.libraries.sessionstorage.api.observer.SessionObserver import io.element.android.libraries.sessionstorage.api.observer.SessionObserver
import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.libraries.ui.strings.CommonStrings
@ -106,7 +107,7 @@ class DefaultNotificationConversationService(
.generateBitmap(defaultShortcutIconSize, AvatarData(id = roomId.value, name = roomName, size = AvatarSize.RoomHeader)) .generateBitmap(defaultShortcutIconSize, AvatarData(id = roomId.value, name = roomName, size = AvatarSize.RoomHeader))
?.let(IconCompat::createWithAdaptiveBitmap) ?.let(IconCompat::createWithAdaptiveBitmap)
val shortcutInfo = ShortcutInfoCompat.Builder(context, "$sessionId-$roomId") val shortcutInfo = ShortcutInfoCompat.Builder(context, createShortcutId(sessionId, roomId))
.setShortLabel(roomName) .setShortLabel(roomName)
.setIcon(icon) .setIcon(icon)
.setIntent(intentProvider.getViewRoomIntent(sessionId, roomId, threadId = null)) .setIntent(intentProvider.getViewRoomIntent(sessionId, roomId, threadId = null))
@ -127,7 +128,7 @@ class DefaultNotificationConversationService(
} }
override suspend fun onLeftRoom(sessionId: SessionId, roomId: RoomId) { override suspend fun onLeftRoom(sessionId: SessionId, roomId: RoomId) {
val shortcutsToRemove = listOf("$sessionId-$roomId") val shortcutsToRemove = listOf(createShortcutId(sessionId, roomId))
runCatchingExceptions { runCatchingExceptions {
ShortcutManagerCompat.removeDynamicShortcuts(context, shortcutsToRemove) ShortcutManagerCompat.removeDynamicShortcuts(context, shortcutsToRemove)
if (isRequestPinShortcutSupported) { if (isRequestPinShortcutSupported) {

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

@ -41,6 +41,7 @@ import io.element.android.libraries.push.impl.notifications.model.FallbackNotifi
import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent import io.element.android.libraries.push.impl.notifications.model.InviteNotifiableEvent
import io.element.android.libraries.push.impl.notifications.model.NotifiableMessageEvent import io.element.android.libraries.push.impl.notifications.model.NotifiableMessageEvent
import io.element.android.libraries.push.impl.notifications.model.SimpleNotifiableEvent import io.element.android.libraries.push.impl.notifications.model.SimpleNotifiableEvent
import io.element.android.libraries.push.impl.notifications.shortcut.createShortcutId
import io.element.android.services.toolbox.api.strings.StringProvider import io.element.android.services.toolbox.api.strings.StringProvider
interface NotificationCreator { interface NotificationCreator {
@ -140,7 +141,7 @@ class DefaultNotificationCreator(
// Must match those created in the ShortcutInfoCompat.Builder() // Must match those created in the ShortcutInfoCompat.Builder()
// for the notification to appear as a "Conversation": // for the notification to appear as a "Conversation":
// https://developer.android.com/develop/ui/views/notifications/conversations // https://developer.android.com/develop/ui/views/notifications/conversations
.setShortcutId("${roomInfo.sessionId.value}-${roomInfo.roomId.value}") .setShortcutId(createShortcutId(roomInfo.sessionId, roomInfo.roomId))
// Auto-bundling is enabled for 4 or more notifications on API 24+ (N+) // 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 // devices and all Wear devices. But we want a custom grouping, so we specify the groupID
.setGroup(roomInfo.sessionId.value) .setGroup(roomInfo.sessionId.value)

13
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/shortcut/Utils.kt Normal file
View file

@ -0,0 +1,13 @@
/*
* Copyright 2025 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.libraries.push.impl.notifications.shortcut
import io.element.android.libraries.matrix.api.core.RoomId
import io.element.android.libraries.matrix.api.core.SessionId
internal fun createShortcutId(sessionId: SessionId, roomId: RoomId) = "$sessionId-$roomId"