diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-30 10:16:51 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-30 10:16:51 -0300 |
| commit | bd1b38845b91541c2f7964ad5eae5b72ff4938fc (patch) | |
| tree | c252b407efa31ea68cb12205a190da361798e157 | |
| parent | a57caf8847735bf8ae9925945c950f2c166b882e (diff) | |
| parent | 35f1b28cab97b74588c5c3386bb648fc2f969d05 (diff) | |
| download | mullvadvpn-bd1b38845b91541c2f7964ad5eae5b72ff4938fc.tar.xz mullvadvpn-bd1b38845b91541c2f7964ad5eae5b72ff4938fc.zip | |
Merge branch 'avoid-starting-with-invisible-account-input'
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b239e10c8a..a7dc7f4ac5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -87,6 +87,7 @@ Line wrap the file at 100 chars. Th - Fix app showing that it was blocking connections when it wasn't when VPN permission was denied. - Fix internet not working for a minute or two after changing Allow LAN setting. - Fix login appearing to be cancelled after leaving the login screen while logging in. +- Fix login input area missing some times when opening the login screen. #### Windows - Fix log output encoding for Windows modules. 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 9ec172bf81..d713759c3c 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt @@ -68,6 +68,8 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { } override fun onSafelyStart() { + accountLogin.state = LoginState.Initial + jobTracker.newBackgroundJob("checkIfAlreadyLoggedIn") { if (accountCache.onAccountNumberChange.latestEvent != null) { val loginResult = if (accountCache.newlyCreatedAccount) { |