Remove `WwwAuthTokenRetriever`

6 files changed, 6 insertions, 27 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/WwwAuthTokenRetriever.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/WwwAuthTokenRetriever.kt
deleted file mode 100644
index 0957895c2e..0000000000
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/WwwAuthTokenRetriever.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package net.mullvad.mullvadvpn.dataproxy
-
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.async
-import net.mullvad.mullvadvpn.service.MullvadDaemon
-
-class WwwAuthTokenRetriever(val daemon: MullvadDaemon) {
-    suspend fun getAuthToken() = GlobalScope.async(Dispatchers.Default) {
-        // returning an empty string is valid in case of any failures
-        daemon.getWwwAuthToken()
-    }
-}
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
index 0bd1fff0d2..1c41c912ac 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
@@ -49,8 +49,7 @@ class ConnectFragment : ServiceDependentFragment() {
         }
 
         headerBar = HeaderBar(view, resources)
-        notificationBanner =
-            NotificationBanner(view, parentActivity, appVersionInfoCache, wwwAuthTokenRetriever)
+        notificationBanner = NotificationBanner(view, parentActivity, appVersionInfoCache, daemon)
         status = ConnectionStatus(view, resources)
 
         locationInfo = LocationInfo(view, context!!)
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/NotificationBanner.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/NotificationBanner.kt
index fad7f63011..3214248f3d 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/NotificationBanner.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/NotificationBanner.kt
@@ -13,9 +13,9 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.dataproxy.AppVersionInfoCache
-import net.mullvad.mullvadvpn.dataproxy.WwwAuthTokenRetriever
 import net.mullvad.mullvadvpn.model.KeygenEvent
 import net.mullvad.mullvadvpn.model.TunnelState
+import net.mullvad.mullvadvpn.service.MullvadDaemon
 import net.mullvad.talpid.tunnel.ActionAfterDisconnect
 import net.mullvad.talpid.tunnel.ErrorState
 import net.mullvad.talpid.tunnel.ErrorStateCause
@@ -25,7 +25,7 @@ class NotificationBanner(
     val parentView: View,
     val context: Context,
     val versionInfoCache: AppVersionInfoCache,
-    val authTokenRetriever: WwwAuthTokenRetriever
+    val daemon: MullvadDaemon
 ) {
     enum class ExternalLink { Download, KeyManagement }
 
@@ -61,8 +61,8 @@ class NotificationBanner(
             }
 
             override fun onClick(): Job {
-                return GlobalScope.launch(Dispatchers.Main) {
-                    val token = authTokenRetriever.getAuthToken().await()
+                return GlobalScope.launch(Dispatchers.Default) {
+                    val token = daemon.getWwwAuthToken()
                     val url = Uri.parse(keyManagementUrl + "?token=" + token)
                     context.startActivity(Intent(Intent.ACTION_VIEW, url))
                 }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt
index 30ba233a5d..af4f49efda 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt
@@ -6,7 +6,6 @@ import net.mullvad.mullvadvpn.dataproxy.KeyStatusListener
 import net.mullvad.mullvadvpn.dataproxy.LocationInfoCache
 import net.mullvad.mullvadvpn.dataproxy.RelayListListener
 import net.mullvad.mullvadvpn.dataproxy.SettingsListener
-import net.mullvad.mullvadvpn.dataproxy.WwwAuthTokenRetriever
 import net.mullvad.mullvadvpn.service.ServiceInstance
 
 class ServiceConnection(private val service: ServiceInstance, val mainActivity: MainActivity) {
@@ -20,7 +19,6 @@ class ServiceConnection(private val service: ServiceInstance, val mainActivity:
     val accountCache = AccountCache(settingsListener, daemon)
     var relayListListener = RelayListListener(daemon, settingsListener)
     val locationInfoCache = LocationInfoCache(daemon, connectivityListener, relayListListener)
-    val wwwAuthTokenRetriever = WwwAuthTokenRetriever(daemon)
 
     init {
         appVersionInfoCache.onCreate()
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt
index d38f2f4384..fa855137db 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt
@@ -7,7 +7,6 @@ import net.mullvad.mullvadvpn.dataproxy.KeyStatusListener
 import net.mullvad.mullvadvpn.dataproxy.LocationInfoCache
 import net.mullvad.mullvadvpn.dataproxy.RelayListListener
 import net.mullvad.mullvadvpn.dataproxy.SettingsListener
-import net.mullvad.mullvadvpn.dataproxy.WwwAuthTokenRetriever
 import net.mullvad.mullvadvpn.service.MullvadDaemon
 import net.mullvad.talpid.ConnectivityListener
 
@@ -39,9 +38,6 @@ open class ServiceDependentFragment : ServiceAwareFragment() {
     lateinit var settingsListener: SettingsListener
         private set
 
-    lateinit var wwwAuthTokenRetriever: WwwAuthTokenRetriever
-        private set
-
     override fun onNewServiceConnection(serviceConnection: ServiceConnection) {
         accountCache = serviceConnection.accountCache
         appVersionInfoCache = serviceConnection.appVersionInfoCache
@@ -52,6 +48,5 @@ open class ServiceDependentFragment : ServiceAwareFragment() {
         locationInfoCache = serviceConnection.locationInfoCache
         relayListListener = serviceConnection.relayListListener
         settingsListener = serviceConnection.settingsListener
-        wwwAuthTokenRetriever = serviceConnection.wwwAuthTokenRetriever
     }
 }
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 f0e89a9328..f24a5b7c79 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
@@ -85,7 +85,7 @@ class WireguardKeyFragment : ServiceDependentFragment() {
 
                 override fun onClick(): Job {
                     return GlobalScope.launch(Dispatchers.Default) {
-                        val token = wwwAuthTokenRetriever.getAuthToken().await()
+                        val token = daemon.getWwwAuthToken()
                         val intent = Intent(Intent.ACTION_VIEW,
                                             Uri.parse(keyUrl + "?token=" + token))
                         startActivity(intent)