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

Notification: fix issue: clear event only for the matching session.

Browse source 
We do not have multi session so the bug is not visible yet.
This commit is contained in:
Benoit Marty 2023-10-27 14:41:39 +02:00
parent 38de57bb02
commit 2d9d34b41f
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManager.kt
View file

@ -195,9 +195,9 @@ class DefaultNotificationDrawerManager @Inject constructor(
/** /**
* Clear the notifications for a single event. * Clear the notifications for a single event.
*/ */
fun clearEvent(eventId: EventId, doRender: Boolean) { fun clearEvent(sessionId: SessionId, eventId: EventId, doRender: Boolean) {
updateEvents(doRender = doRender) { updateEvents(doRender = doRender) {
it.clearEvent(eventId) it.clearEvent(sessionId, eventId)
} }
} }

2
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationBroadcastReceiver.kt
View file

@ -56,7 +56,7 @@ class NotificationBroadcastReceiver : BroadcastReceiver() {
defaultNotificationDrawerManager.clearMembershipNotificationForRoom(sessionId, roomId, doRender = false) defaultNotificationDrawerManager.clearMembershipNotificationForRoom(sessionId, roomId, doRender = false)
} }
actionIds.dismissEvent -> if (eventId != null) { actionIds.dismissEvent -> if (eventId != null) {
defaultNotificationDrawerManager.clearEvent(eventId, doRender = false) defaultNotificationDrawerManager.clearEvent(sessionId, eventId, doRender = false)
} }
actionIds.markRoomRead -> if (roomId != null) { actionIds.markRoomRead -> if (roomId != null) {
defaultNotificationDrawerManager.clearMessagesForRoom(sessionId, roomId, doRender = true) defaultNotificationDrawerManager.clearMessagesForRoom(sessionId, roomId, doRender = true)

4
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationEventQueue.kt
View file

@ -135,8 +135,8 @@ data class NotificationEventQueue constructor(
) )
} }
fun clearEvent(eventId: EventId) { fun clearEvent(sessionId: SessionId, eventId: EventId) {
queue.removeAll { it.eventId == eventId } queue.removeAll { it.sessionId == sessionId && it.eventId == eventId }
} }
fun clearMembershipNotificationForSession(sessionId: SessionId) { fun clearMembershipNotificationForSession(sessionId: SessionId) {