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

Pin: use moveTaskToBack instead of finish

Browse source
This commit is contained in:
ganfra 2023-10-11 20:25:51 +02:00
parent a2ebf39cb5
commit 45feedb208
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
appnav/src/main/kotlin/io/element/android/appnav/BackstackExt.kt
View file

@ -48,7 +48,7 @@ fun <T : Any> BackStack<T>.removeLast(element: T) {
} }
@Composable @Composable
fun FinishActivityBackHandler(enabled: Boolean = true) { fun MoveActivityToBackgroundBackHandler(enabled: Boolean = true) {
fun Context.findActivity(): ComponentActivity? = when (this) { fun Context.findActivity(): ComponentActivity? = when (this) {
is ComponentActivity -> this is ComponentActivity -> this
@ -58,7 +58,7 @@ fun FinishActivityBackHandler(enabled: Boolean = true) {
val context = LocalContext.current val context = LocalContext.current
BackHandler(enabled = enabled) { BackHandler(enabled = enabled) {
context.findActivity()?.finish() context.findActivity()?.moveTaskToBack(false)
} }
} }

2
appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
View file

@ -351,7 +351,7 @@ class LoggedInFlowNode @AssistedInject constructor(
} }
} }
PinState.Locked -> { PinState.Locked -> {
FinishActivityBackHandler() MoveActivityToBackgroundBackHandler()
PermanentChild(permanentNavModel = permanentNavModel, navTarget = NavTarget.LockPermanent) PermanentChild(permanentNavModel = permanentNavModel, navTarget = NavTarget.LockPermanent)
} }
} }