Fix rendering notifications if event ID is duplicated (#5711)

SpiritCroc · web-flow · commit 6416c7992505 · 2025-11-10T21:54:09.000+01:00
diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/RustNotificationService.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/notification/RustNotificationService.kt
@@ -45,7 +45,7 @@ class RustNotificationService(
             }
             val items = notificationClient.getNotifications(requests)
             buildMap {
-                val eventIds = requests.flatMap { it.eventIds }
+                val eventIds = requests.flatMap { it.eventIds }.distinct()
                 for (rawEventId in eventIds) {
                     val roomId = RoomId(requests.find { it.eventIds.contains(rawEventId) }?.roomId!!)
                     val eventId = EventId(rawEventId)

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class RustNotificationService(`
`45`	`45`	`}`
`46`	`46`	`val items = notificationClient.getNotifications(requests)`
`47`	`47`	`buildMap {`
`48`		`- val eventIds = requests.flatMap { it.eventIds }`
	`48`	`+ val eventIds = requests.flatMap { it.eventIds }.distinct()`
`49`	`49`	`for (rawEventId in eventIds) {`
`50`	`50`	`val roomId = RoomId(requests.find { it.eventIds.contains(rawEventId) }?.roomId!!)`
`51`	`51`	`val eventId = EventId(rawEventId)`