diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-26 18:14:04 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-11-27 13:17:04 +0000 |
| commit | eb0ac7fd78e79a47430b6f4c1d5e865f8002c107 (patch) | |
| tree | 6f49b6e6e38c23850e661718d026d6a6ea21f6e8 /android | |
| parent | d01f0870ef9e11422ba84e4ed245d4e0de3fcdf1 (diff) | |
| download | mullvadvpn-eb0ac7fd78e79a47430b6f4c1d5e865f8002c107.tar.xz mullvadvpn-eb0ac7fd78e79a47430b6f4c1d5e865f8002c107.zip | |
Advance to next screen if already logged in
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt | 12 |
1 files changed, 12 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 19dabcb60e..9ec172bf81 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,18 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { } override fun onSafelyStart() { + jobTracker.newBackgroundJob("checkIfAlreadyLoggedIn") { + if (accountCache.onAccountNumberChange.latestEvent != null) { + val loginResult = if (accountCache.newlyCreatedAccount) { + LoginResult.NewAccount + } else { + loginResultForExpiry(accountCache.onAccountExpiryChange.latestEvent) + } + + loggedIn.complete(loginResult) + } + } + jobTracker.newUiJob("advanceToNextScreen") { when (loggedIn.await()) { LoginResult.ExistingAccountWithTime -> openNextScreen(ConnectFragment()) |