1 files changed, 33 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 3d66abb45f..5fcf67f568 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
@@ -5,9 +5,13 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import kotlinx.coroutines.delay
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.ui.widget.UrlButton
 import net.mullvad.mullvadvpn.util.JobTracker
+import org.joda.time.DateTime
+
+val POLL_INTERVAL: Long = 15 /* s */ * 1000 /* ms */
 
 class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
     private val jobTracker = JobTracker()
@@ -35,11 +39,22 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
     }
 
     override fun onSafelyResume() {
-        accountCache.onAccountDataChange = { account, _ -> updateAccountNumber(account) }
+        accountCache.onAccountDataChange = { account, expiry ->
+            updateAccountNumber(account)
+            checkExpiry(expiry)
+        }
+
+        jobTracker.newBackgroundJob("pollAccountData") {
+            while (true) {
+                accountCache.refetch()
+                delay(POLL_INTERVAL)
+            }
+        }
     }
 
     override fun onSafelyPause() {
         accountCache.onAccountDataChange = null
+        jobTracker.cancelJob("pollAccountData")
     }
 
     override fun onSafelyDestroyView() {
@@ -74,4 +89,21 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
             return parts.joinToString(" ")
         }
     }
+
+    private fun checkExpiry(maybeExpiry: DateTime?) {
+        maybeExpiry?.let { expiry ->
+            if (expiry.isAfterNow()) {
+                jobTracker.newUiJob("advanceToConnectScreen") {
+                    advanceToConnectScreen()
+                }
+            }
+        }
+    }
+
+    private fun advanceToConnectScreen() {
+        fragmentManager?.beginTransaction()?.apply {
+            replace(R.id.main_fragment, ConnectFragment())
+            commit()
+        }
+    }
 }