summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
Diffstat (limited to 'android')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt14
1 files changed, 9 insertions, 5 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 c84961fc53..19dabcb60e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
@@ -146,11 +146,7 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
val expiryString = accountDataResult.accountData.expiry
val expiry = DateTime.parse(expiryString, AccountCache.EXPIRY_FORMAT)
- if (expiry.isAfterNow()) {
- LoginResult.ExistingAccountWithTime
- } else {
- LoginResult.ExistingAccountOutOfTime
- }
+ loginResultForExpiry(expiry)
}
is GetAccountDataResult.RpcError -> {
accountCache.login(accountToken)
@@ -206,4 +202,12 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
scrollToShow(accountLogin)
}
+
+ private fun loginResultForExpiry(expiry: DateTime?): LoginResult {
+ if (expiry == null || expiry.isAfterNow()) {
+ return LoginResult.ExistingAccountWithTime
+ } else {
+ return LoginResult.ExistingAccountOutOfTime
+ }
+ }
}