diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-27 19:50:17 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-30 13:24:42 +0000 |
| commit | e50709b5472a98ab0461009b0563a7b838300796 (patch) | |
| tree | 99c240a4f2d6af745de3e2e7f11e10d754fcef4a /android/src | |
| parent | f90f1514eaaf4e4fb1e29c362dd85702d03f840f (diff) | |
| download | mullvadvpn-e50709b5472a98ab0461009b0563a7b838300796.tar.xz mullvadvpn-e50709b5472a98ab0461009b0563a7b838300796.zip | |
Close account history when back button is pressed
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt index d713759c3c..fa5df39a0e 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt @@ -95,11 +95,21 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { accountLogin.accountHistory = history } } + + parentActivity.backButtonHandler = { + if (accountLogin.hasFocus) { + background.requestFocus() + true + } else { + false + } + } } override fun onSafelyStop() { jobTracker.cancelJob("advanceToNextScreen") accountCache.onAccountHistoryChange.unsubscribe(this) + parentActivity.backButtonHandler = null } private fun scrollToShow(view: View) { |