ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-04 20:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify again the code.

Browse Source
This commit is contained in:
Benoit Marty
2023-09-15 15:22:25 +02:00
committed by Benoit Marty
parent 9a461f4b74
commit 020839f17e
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/DefaultNotificationDrawerManager.kt
+2 -2
View File
@@ -224,7 +224,7 @@ class DefaultNotificationDrawerManager @Inject constructor(
doRender: Boolean, doRender: Boolean,
action: (NotificationEventQueue) -> Unit, action: (NotificationEventQueue) -> Unit,
) { ) {
notificationState.updateQueuedEvents(this) { queuedEvents, _ -> notificationState.updateQueuedEvents { queuedEvents, _ ->
action(queuedEvents) action(queuedEvents)
} }
coroutineScope.refreshNotificationDrawer(doRender) coroutineScope.refreshNotificationDrawer(doRender)
@@ -247,7 +247,7 @@ class DefaultNotificationDrawerManager @Inject constructor(
private suspend fun refreshNotificationDrawerBg(doRender: Boolean) { private suspend fun refreshNotificationDrawerBg(doRender: Boolean) {
Timber.v("refreshNotificationDrawerBg()") Timber.v("refreshNotificationDrawerBg()")
val eventsToRender = notificationState.updateQueuedEvents(this) { queuedEvents, renderedEvents -> val eventsToRender = notificationState.updateQueuedEvents { queuedEvents, renderedEvents ->
notifiableEventProcessor.process(queuedEvents.rawEvents(), renderedEvents).also { notifiableEventProcessor.process(queuedEvents.rawEvents(), renderedEvents).also {
queuedEvents.clearAndAdd(it.onlyKeptEvents()) queuedEvents.clearAndAdd(it.onlyKeptEvents())
} }
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationState.kt
+2 -3
View File
@@ -39,11 +39,10 @@ class NotificationState(
) { ) {
fun <T> updateQueuedEvents( fun <T> updateQueuedEvents(
drawerManager: DefaultNotificationDrawerManager, action: (NotificationEventQueue, List<ProcessedEvent<NotifiableEvent>>) -> T
action: DefaultNotificationDrawerManager.(NotificationEventQueue, List<ProcessedEvent<NotifiableEvent>>) -> T
): T { ): T {
return synchronized(queuedEvents) { return synchronized(queuedEvents) {
action(drawerManager, queuedEvents, renderedEvents) action(queuedEvents, renderedEvents)
} }
} }