diff options
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt index c473931f77..095c15b5e3 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt @@ -10,6 +10,7 @@ import kotlinx.coroutines.Job import android.content.Context import android.os.Bundle import android.support.v4.app.Fragment +import android.support.v4.app.FragmentManager import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -83,6 +84,7 @@ class AccountFragment : Fragment() { private fun logout() { clearAccountNumber() + clearBackStack() goToLoginScreen() } @@ -92,6 +94,14 @@ class AccountFragment : Fragment() { daemon.setAccount(null) } + private fun clearBackStack() { + fragmentManager?.apply { + val firstEntry = getBackStackEntryAt(0) + + popBackStack(firstEntry.id, FragmentManager.POP_BACK_STACK_INCLUSIVE) + } + } + private fun goToLoginScreen() { fragmentManager?.beginTransaction()?.apply { replace(R.id.main_fragment, LoginFragment()) |