vaultwarden/keyguard-app-Bitwarden-Vaultwarden
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Possible crash because back press intercetor is not registred yet

Browse Source
This commit is contained in:
Artem Chepurnoy 2024-01-22 17:59:20 +02:00
parent 75a21e9bc7
commit 833c2765bd
No known key found for this signature in database
GPG Key ID: FAC37D0CF674043E
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/src/commonMain/kotlin/com/artemchep/keyguard/feature/navigation/backpress/BackPressInterceptorUtil.kt
View File

@ -2,15 +2,18 @@ package com.artemchep.keyguard.feature.navigation.backpress
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Job
import kotlinx.coroutines.cancel
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.isActive
import kotlinx.coroutines.plus
fun BackPressInterceptorHost.interceptBackPress(
scope: CoroutineScope,
interceptorFlow: Flow<(() -> Unit)?>,
): () -> Unit {
lateinit var job: Job
val subScope = scope + Job()
var callback: (() -> Unit)? = null
// A registration to remove the back press interceptor
@ -41,14 +44,14 @@ fun BackPressInterceptorHost.interceptBackPress(
}
}
job = interceptorFlow
interceptorFlow
.map { c ->
val newCallback = c.takeIf { !job.isCancelled }
val newCallback = c.takeIf { subScope.isActive }
setCallback(newCallback)
}
.launchIn(scope)
.launchIn(subScope)
return {
job.cancel()
subScope.cancel()
// Unregister the existing interceptor,
// if there's any.
unregister?.invoke()