diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-06-03 21:30:18 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-06-03 21:30:18 -0300 |
| commit | 37f9da7e45995d0f78539c800a399c22e7e5f135 (patch) | |
| tree | ed533c012ead84e6cec440838d730370541b60ef /android | |
| parent | 18efa501bd37fd4607a408809cd205b979b2459b (diff) | |
| parent | c376045cbd18c1c848c5b134fc715c2b4e92d28b (diff) | |
| download | mullvadvpn-37f9da7e45995d0f78539c800a399c22e7e5f135.tar.xz mullvadvpn-37f9da7e45995d0f78539c800a399c22e7e5f135.zip | |
Merge branch 'fix-welcome-screen-closing-prematurely'
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt index 246c105398..3aa26db640 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt @@ -103,7 +103,9 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { private fun checkExpiry(maybeExpiry: DateTime?) { maybeExpiry?.let { expiry -> - if (expiry.isAfterNow()) { + val tomorrow = DateTime.now().plusDays(1) + + if (expiry.isAfter(tomorrow)) { jobTracker.newUiJob("advanceToConnectScreen") { advanceToConnectScreen() } |