1 files changed, 4 insertions, 8 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/DeviceListFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/DeviceListFragment.kt
index 6d5e47f8dd..2a6756abe9 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/DeviceListFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/fragments/DeviceListFragment.kt
@@ -37,8 +37,8 @@ class DeviceListFragment : Fragment() {
                     content = {
                         DeviceListScreen(
                             viewModel = deviceListViewModel,
-                            onBackClick = this@DeviceListFragment::goBack,
-                            onContinueWithLogin = this@DeviceListFragment::openLoginView
+                            onBackClick = { openLoginView(doTriggerAutoLogin = false) },
+                            onContinueWithLogin = { openLoginView(doTriggerAutoLogin = true) }
                         )
                     }
                 )
@@ -46,10 +46,10 @@ class DeviceListFragment : Fragment() {
         }
     }
 
-    private fun openLoginView() {
+    private fun openLoginView(doTriggerAutoLogin: Boolean) {
         parentActivity()?.clearBackStack()
         val loginFragment = LoginFragment().apply {
-            if (deviceListViewModel.accountToken != null) {
+            if (doTriggerAutoLogin && deviceListViewModel.accountToken != null) {
                 arguments = Bundle().apply {
                     putString(
                         ACCOUNT_TOKEN_ARGUMENT_KEY,
@@ -64,10 +64,6 @@ class DeviceListFragment : Fragment() {
         }
     }
 
-    private fun goBack() {
-        parentActivity()?.onBackPressed()
-    }
-
     private fun parentActivity(): MainActivity? {
         return (context as? MainActivity)
     }