Browse Source

Display a single notification for all the fallback notifications.

When dismissed, dismiss all the fallback notifications in the model.
pull/1666/head
Benoit Marty 11 months ago
parent
commit
cb0abd4c12
  1. 1
      changelog.d/994.bugfix
  2. 6
      libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationEventQueue.kt
  3. 18
      libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRenderer.kt

1
changelog.d/994.bugfix

@ -0,0 +1 @@ @@ -0,0 +1 @@
Group fallback notification to avoid having plenty of them displayed.

6
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationEventQueue.kt

@ -136,8 +136,14 @@ data class NotificationEventQueue constructor( @@ -136,8 +136,14 @@ data class NotificationEventQueue constructor(
}
fun clearEvent(sessionId: SessionId, eventId: EventId) {
val isFallback = queue.firstOrNull { it.sessionId == sessionId && it.eventId == eventId } is FallbackNotifiableEvent
if (isFallback) {
Timber.d("Removing all the fallbacks")
queue.removeAll { it.sessionId == sessionId && it is FallbackNotifiableEvent }
} else {
queue.removeAll { it.sessionId == sessionId && it.eventId == eventId }
}
}
fun clearMembershipNotificationForSession(sessionId: SessionId) {
Timber.d("clearMemberShipOfSession $sessionId")

18
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationRenderer.kt

@ -124,6 +124,7 @@ class NotificationRenderer @Inject constructor( @@ -124,6 +124,7 @@ class NotificationRenderer @Inject constructor(
}
}
/*
fallbackNotifications.forEach { wrapper ->
when (wrapper) {
is OneShotNotification.Removed -> {
@ -143,6 +144,23 @@ class NotificationRenderer @Inject constructor( @@ -143,6 +144,23 @@ class NotificationRenderer @Inject constructor(
}
}
}
*/
val removedFallback = fallbackNotifications.filterIsInstance<OneShotNotification.Removed>()
val appendFallback = fallbackNotifications.filterIsInstance<OneShotNotification.Append>()
if (appendFallback.isEmpty() && removedFallback.isNotEmpty()) {
Timber.tag(loggerTag.value).d("Removing global fallback notification")
notificationDisplayer.cancelNotificationMessage(
tag = "FALLBACK",
id = notificationIdProvider.getFallbackNotificationId(currentUser.userId)
)
} else if (appendFallback.isNotEmpty()) {
Timber.tag(loggerTag.value).d("Showing fallback notification")
notificationDisplayer.showNotificationMessage(
tag = "FALLBACK",
id = notificationIdProvider.getFallbackNotificationId(currentUser.userId),
notification = appendFallback.first().notification
)
}
// Update summary last to avoid briefly displaying it before other notifications
if (summaryNotification is SummaryNotification.Update) {

Loading…
Cancel
Save