summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt12
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())