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

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 e0cef81118
commit f0bb391519
2 changed files with 4 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

@ -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())
} }

5
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/NotificationState.kt
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)
} }
} }