Merge branch 'clear-back-stack-on-service-loss'

1 files changed, 8 insertions, 3 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
index a4595a9a92..10e886f73e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -7,6 +7,7 @@ import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
 import android.support.v4.app.FragmentActivity
+import android.support.v4.app.FragmentManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -119,9 +120,13 @@ class MainActivity : FragmentActivity() {
     }
 
     fun returnToLaunchScreen() {
-        supportFragmentManager?.beginTransaction()?.apply {
-            replace(R.id.main_fragment, LaunchFragment())
-            commit()
+        supportFragmentManager?.apply {
+            popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)
+
+            beginTransaction().apply {
+                replace(R.id.main_fragment, LaunchFragment())
+                commit()
+            }
         }
     }