From ea0963c0c8e6c4c658ea44cb160389f7da435080 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 11 Oct 2023 20:25:51 +0200
Subject: [PATCH] Pin: use moveTaskToBack instead of finish

---
 .../src/main/kotlin/io/element/android/appnav/BackstackExt.kt | 4 ++--
 .../main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/appnav/src/main/kotlin/io/element/android/appnav/BackstackExt.kt b/appnav/src/main/kotlin/io/element/android/appnav/BackstackExt.kt
index 73bb9b9b85..e7bf9f200f 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/BackstackExt.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/BackstackExt.kt
@@ -48,7 +48,7 @@ fun <T : Any> BackStack<T>.removeLast(element: T) {
 }
 
 @Composable
-fun FinishActivityBackHandler(enabled: Boolean = true) {
+fun MoveActivityToBackgroundBackHandler(enabled: Boolean = true) {
 
     fun Context.findActivity(): ComponentActivity? = when (this) {
         is ComponentActivity -> this
@@ -58,7 +58,7 @@ fun FinishActivityBackHandler(enabled: Boolean = true) {
 
     val context = LocalContext.current
     BackHandler(enabled = enabled) {
-        context.findActivity()?.finish()
+        context.findActivity()?.moveTaskToBack(false)
     }
 }
 
diff --git a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
index 276f0ebbde..6bc8c3afaf 100644
--- a/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
+++ b/appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt
@@ -351,7 +351,7 @@ class LoggedInFlowNode @AssistedInject constructor(
                     }
                 }
                 PinState.Locked -> {
-                    FinishActivityBackHandler()
+                    MoveActivityToBackgroundBackHandler()
                     PermanentChild(permanentNavModel = permanentNavModel, navTarget = NavTarget.LockPermanent)
                 }
             }