Reuse getNotificationsForSession(sessionId) in other methods

jmartinesp · jmartinesp · commit f925b45e12c4 · 2024-05-28T15:42:21.000+02:00
diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ActiveNotificationsProvider.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/ActiveNotificationsProvider.kt
@@ -54,7 +54,7 @@ class DefaultActiveNotificationsProvider @Inject constructor(
 
     override fun getMessageNotificationsForRoom(sessionId: SessionId, roomId: RoomId): List<StatusBarNotification> {
         val notificationId = notificationIdProvider.getRoomMessagesNotificationId(sessionId)
-        return notificationManager.activeNotifications.filter { it.id == notificationId && it.tag == roomId.value }
+        return getNotificationsForSession(sessionId).filter { it.id == notificationId && it.tag == roomId.value }
     }
 
     override fun getMembershipNotificationForRoom(sessionId: SessionId, roomId: RoomId): List<StatusBarNotification> {
@@ -64,7 +64,7 @@ class DefaultActiveNotificationsProvider @Inject constructor(
 
     override fun getSummaryNotification(sessionId: SessionId): StatusBarNotification? {
         val summaryId = notificationIdProvider.getSummaryNotificationId(sessionId)
-        return notificationManager.activeNotifications.find { it.id == summaryId }
+        return getNotificationsForSession(sessionId).find { it.id == summaryId }
     }
 
     override fun count(sessionId: SessionId): Int {

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class DefaultActiveNotificationsProvider @Inject constructor(`
`54`	`54`
`55`	`55`	`override fun getMessageNotificationsForRoom(sessionId: SessionId, roomId: RoomId): List<StatusBarNotification> {`
`56`	`56`	`val notificationId = notificationIdProvider.getRoomMessagesNotificationId(sessionId)`
`57`		`- return notificationManager.activeNotifications.filter { it.id == notificationId && it.tag == roomId.value }`
	`57`	`+ return getNotificationsForSession(sessionId).filter { it.id == notificationId && it.tag == roomId.value }`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`override fun getMembershipNotificationForRoom(sessionId: SessionId, roomId: RoomId): List<StatusBarNotification> {`
`@@ -64,7 +64,7 @@ class DefaultActiveNotificationsProvider @Inject constructor(`
`64`	`64`
`65`	`65`	`override fun getSummaryNotification(sessionId: SessionId): StatusBarNotification? {`
`66`	`66`	`val summaryId = notificationIdProvider.getSummaryNotificationId(sessionId)`
`67`		`- return notificationManager.activeNotifications.find { it.id == summaryId }`
	`67`	`+ return getNotificationsForSession(sessionId).find { it.id == summaryId }`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`override fun count(sessionId: SessionId): Int {`