Ensure that setting change is taken at least 300ms to avoid dialog flickering (#1647)
This commit is contained in:
parent
f31c91a417
commit
38b68a93f0
2 changed files with 33 additions and 2 deletions
|
|
@ -32,6 +32,7 @@ import io.element.android.libraries.architecture.AsyncAction
|
||||||
import io.element.android.libraries.architecture.AsyncData
|
import io.element.android.libraries.architecture.AsyncData
|
||||||
import io.element.android.libraries.architecture.Presenter
|
import io.element.android.libraries.architecture.Presenter
|
||||||
import io.element.android.libraries.architecture.runCatchingUpdatingState
|
import io.element.android.libraries.architecture.runCatchingUpdatingState
|
||||||
|
import io.element.android.libraries.core.coroutine.suspendWithMinimumDuration
|
||||||
import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
|
import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
|
||||||
import io.element.android.libraries.matrix.api.room.MatrixRoom
|
import io.element.android.libraries.matrix.api.room.MatrixRoom
|
||||||
import io.element.android.libraries.matrix.api.room.RoomNotificationMode
|
import io.element.android.libraries.matrix.api.room.RoomNotificationMode
|
||||||
|
|
@ -171,7 +172,7 @@ class RoomNotificationSettingsPresenter @AssistedInject constructor(
|
||||||
pendingDefaultState: MutableState<Boolean?>,
|
pendingDefaultState: MutableState<Boolean?>,
|
||||||
action: MutableState<AsyncAction<Unit>>
|
action: MutableState<AsyncAction<Unit>>
|
||||||
) = launch {
|
) = launch {
|
||||||
suspend {
|
suspendWithMinimumDuration {
|
||||||
pendingModeState.value = mode
|
pendingModeState.value = mode
|
||||||
pendingDefaultState.value = false
|
pendingDefaultState.value = false
|
||||||
val result = notificationSettingsService.setRoomNotificationMode(room.roomId, mode)
|
val result = notificationSettingsService.setRoomNotificationMode(room.roomId, mode)
|
||||||
|
|
@ -187,7 +188,7 @@ class RoomNotificationSettingsPresenter @AssistedInject constructor(
|
||||||
action: MutableState<AsyncAction<Unit>>,
|
action: MutableState<AsyncAction<Unit>>,
|
||||||
pendingDefaultState: MutableState<Boolean?>
|
pendingDefaultState: MutableState<Boolean?>
|
||||||
) = launch {
|
) = launch {
|
||||||
suspend {
|
suspendWithMinimumDuration {
|
||||||
pendingDefaultState.value = true
|
pendingDefaultState.value = true
|
||||||
val result = notificationSettingsService.restoreDefaultRoomNotificationMode(room.roomId)
|
val result = notificationSettingsService.restoreDefaultRoomNotificationMode(room.roomId)
|
||||||
if (result.isFailure) {
|
if (result.isFailure) {
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,30 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2024 New Vector Ltd
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package io.element.android.libraries.core.coroutine
|
||||||
|
|
||||||
|
import kotlinx.coroutines.delay
|
||||||
|
import kotlin.system.measureTimeMillis
|
||||||
|
|
||||||
|
fun suspendWithMinimumDuration(
|
||||||
|
minimumDurationMillis: Long = 500,
|
||||||
|
block: suspend () -> Unit
|
||||||
|
) = suspend {
|
||||||
|
val duration = measureTimeMillis {
|
||||||
|
block()
|
||||||
|
}
|
||||||
|
delay(minimumDurationMillis - duration)
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue