Use `AuthTokenCache` in `UrlButton`

5 files changed, 10 insertions, 10 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
index 846bf996e6..2b8d9341cf 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountFragment.kt
@@ -68,7 +68,7 @@ class AccountFragment : ServiceDependentFragment(OnNoService.GoBack) {
         sitePaymentButton = view.findViewById<SitePaymentButton>(R.id.site_payment).apply {
             newAccount = false
 
-            prepare(daemon, jobTracker) {
+            prepare(authTokenCache, jobTracker) {
                 checkForAddedTime()
             }
         }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
index 8443d7c530..1de849529e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
@@ -53,7 +53,7 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen)
 
         sitePaymentButton = view.findViewById<SitePaymentButton>(R.id.site_payment).apply {
             newAccount = false
-            prepare(daemon, jobTracker)
+            prepare(authTokenCache, jobTracker)
         }
 
         redeemButton = view.findViewById<RedeemVoucherButton>(R.id.redeem_voucher).apply {
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 8d4500c6f2..9aadce014b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WelcomeFragment.kt
@@ -43,7 +43,7 @@ class WelcomeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
 
         view.findViewById<SitePaymentButton>(R.id.site_payment).apply {
             newAccount = true
-            prepare(daemon, jobTracker)
+            prepare(authTokenCache, jobTracker)
         }
 
         view.findViewById<RedeemVoucherButton>(R.id.redeem_voucher).apply {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
index b5494cd82a..4e5601c2c3 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
@@ -138,7 +138,7 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre
         verifyingKeySpinner = view.findViewById(R.id.verifying_key_spinner)
 
         manageKeysButton = view.findViewById<UrlButton>(R.id.manage_keys).apply {
-            prepare(daemon, jobTracker)
+            prepare(authTokenCache, jobTracker)
         }
 
         titleController = CollapsibleTitleController(view)
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt
index ddef67c634..613f65524e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt
@@ -8,11 +8,11 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.async
 import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.service.MullvadDaemon
+import net.mullvad.mullvadvpn.ui.serviceconnection.AuthTokenCache
 import net.mullvad.mullvadvpn.util.JobTracker
 
 open class UrlButton : Button {
-    private lateinit var daemon: MullvadDaemon
+    private lateinit var authTokenCache: AuthTokenCache
 
     private var shouldEnable = true
 
@@ -46,7 +46,7 @@ open class UrlButton : Button {
     }
 
     fun prepare(
-        daemon: MullvadDaemon,
+        authTokenCache: AuthTokenCache,
         jobTracker: JobTracker,
         jobName: String = "fetchUrl",
         extraOnClickAction: (suspend () -> Unit)? = null
@@ -54,7 +54,7 @@ open class UrlButton : Button {
         synchronized(this) {
             super.setEnabled(shouldEnable)
 
-            this.daemon = daemon
+            this.authTokenCache = authTokenCache
 
             setOnClickAction(jobName, jobTracker) {
                 super.setEnabled(false)
@@ -71,7 +71,7 @@ open class UrlButton : Button {
         synchronized(this) {
             shouldEnable = enabled
 
-            if (!withToken || this::daemon.isInitialized) {
+            if (!withToken || this::authTokenCache.isInitialized) {
                 super.setEnabled(enabled)
             }
         }
@@ -98,7 +98,7 @@ open class UrlButton : Button {
     private suspend fun buildIntent(jobTracker: JobTracker): Intent {
         val buildIntent = GlobalScope.async(Dispatchers.Default) {
             val uri = if (withToken) {
-                Uri.parse(url + "?token=" + daemon.getWwwAuthToken())
+                Uri.parse(url + "?token=" + authTokenCache.fetchAuthToken())
             } else {
                 Uri.parse(url)
             }