diff options
5 files changed, 16 insertions, 1 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt index 2b8d9341cf..02c8bba71f 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt @@ -119,6 +119,8 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) { oldAccountExpiry?.let { expiry -> accountCache.invalidateAccountExpiry(expiry) } + + sitePaymentButton.updateAuthTokenCache(authTokenCache) } override fun onSafelyStop() { diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt index 1de849529e..af81154247 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt @@ -80,6 +80,8 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) delay(POLL_INTERVAL) } } + + sitePaymentButton.updateAuthTokenCache(authTokenCache) } override fun onSafelyStop() { diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt index 9aadce014b..84b9d27a93 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt @@ -21,6 +21,7 @@ val POLL_INTERVAL: Long = 15 /* s */ * 1000 /* ms */ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { private lateinit var accountLabel: TextView + private lateinit var sitePaymentButton: SitePaymentButton override fun onSafelyCreateView( inflater: LayoutInflater, @@ -41,7 +42,7 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { parentActivity.getString(R.string.pay_to_start_using) + " " + parentActivity.getString(R.string.add_time_to_account) - view.findViewById<SitePaymentButton>(R.id.site_payment).apply { + sitePaymentButton = view.findViewById<SitePaymentButton>(R.id.site_payment).apply { newAccount = true prepare(authTokenCache, jobTracker) } @@ -68,6 +69,8 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { delay(POLL_INTERVAL) } } + + sitePaymentButton.updateAuthTokenCache(authTokenCache) } override fun onSafelyStop() { diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt index 4e5601c2c3..506cf340da 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt @@ -168,6 +168,8 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre } } + manageKeysButton.updateAuthTokenCache(authTokenCache) + actionState = ActionState.Idle(false) } diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt index 613f65524e..f6d7efe0e7 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt @@ -67,6 +67,12 @@ open class UrlButton : Button { } } + fun updateAuthTokenCache(authTokenCache: AuthTokenCache) { + synchronized(this) { + this.authTokenCache = authTokenCache + } + } + override fun setEnabled(enabled: Boolean) { synchronized(this) { shouldEnable = enabled |