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

Introduce filterBySession() extension

Browse source
This commit is contained in:
Benoit Marty 2025-09-09 09:02:25 +02:00
parent a6f3a16d5f
commit 6d6cdfc55b
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,7 @@ import io.element.android.libraries.push.api.notifications.NotificationBitmapLoa
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.push.impl.notifications.shortcut.createShortcutId
import io.element.android.libraries.push.impl.notifications.shortcut.filterBySession
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
@ -182,7 +183,7 @@ class DefaultNotificationConversationService(
private fun onSessionLogOut(sessionId: SessionId) { private fun onSessionLogOut(sessionId: SessionId) {
runCatchingExceptions { runCatchingExceptions {
val shortcuts = ShortcutManagerCompat.getDynamicShortcuts(context) val shortcuts = ShortcutManagerCompat.getDynamicShortcuts(context)
val shortcutIdsToRemove = shortcuts.filter { it.id.startsWith(sessionId.value) }.map { it.id } val shortcutIdsToRemove = shortcuts.filterBySession(sessionId).map { it.id }
ShortcutManagerCompat.removeDynamicShortcuts(context, shortcutIdsToRemove) ShortcutManagerCompat.removeDynamicShortcuts(context, shortcutIdsToRemove)
if (isRequestPinShortcutSupported) { if (isRequestPinShortcutSupported) {

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

@ -7,7 +7,13 @@
package io.element.android.libraries.push.impl.notifications.shortcut package io.element.android.libraries.push.impl.notifications.shortcut
import androidx.core.content.pm.ShortcutInfoCompat
import io.element.android.libraries.matrix.api.core.RoomId import io.element.android.libraries.matrix.api.core.RoomId
import io.element.android.libraries.matrix.api.core.SessionId import io.element.android.libraries.matrix.api.core.SessionId
internal fun createShortcutId(sessionId: SessionId, roomId: RoomId) = "$sessionId-$roomId" internal fun createShortcutId(sessionId: SessionId, roomId: RoomId) = "$sessionId-$roomId"
internal fun Iterable<ShortcutInfoCompat>.filterBySession(sessionId: SessionId): Iterable<ShortcutInfoCompat> {
val prefix = "$sessionId-"
return filter { it.id.startsWith(prefix) }
}