diff options
Diffstat (limited to 'android/src')
4 files changed, 11 insertions, 11 deletions
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 9c8e797945..6f701c9ba7 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt @@ -52,9 +52,9 @@ class ConnectFragment : notificationBanner = view.findViewById<NotificationBanner>(R.id.notification_banner).apply { notifications.apply { register(TunnelStateNotification(parentActivity, connectionProxy)) - register(KeyStatusNotification(parentActivity, daemon, keyStatusListener)) + register(KeyStatusNotification(parentActivity, authTokenCache, keyStatusListener)) register(VersionInfoNotification(parentActivity, appVersionInfoCache)) - register(AccountExpiryNotification(parentActivity, daemon, accountCache)) + register(AccountExpiryNotification(parentActivity, authTokenCache, accountCache)) } } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/AccountExpiryNotification.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/AccountExpiryNotification.kt index b45a4e53e8..b959a06607 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/AccountExpiryNotification.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/AccountExpiryNotification.kt @@ -2,16 +2,16 @@ package net.mullvad.mullvadvpn.ui.notification import android.content.Context import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.service.MullvadDaemon import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache +import net.mullvad.mullvadvpn.ui.serviceconnection.AuthTokenCache import net.mullvad.mullvadvpn.util.TimeLeftFormatter import org.joda.time.DateTime class AccountExpiryNotification( context: Context, - daemon: MullvadDaemon, + authTokenCache: AuthTokenCache, private val accountCache: AccountCache -) : NotificationWithUrlWithToken(context, daemon, R.string.account_url) { +) : NotificationWithUrlWithToken(context, authTokenCache, R.string.account_url) { private val timeLeftFormatter = TimeLeftFormatter(context.resources) init { diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/KeyStatusNotification.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/KeyStatusNotification.kt index fba57eca03..93bd4f4cb3 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/KeyStatusNotification.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/KeyStatusNotification.kt @@ -3,14 +3,14 @@ package net.mullvad.mullvadvpn.ui.notification import android.content.Context import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.model.KeygenEvent -import net.mullvad.mullvadvpn.service.MullvadDaemon +import net.mullvad.mullvadvpn.ui.serviceconnection.AuthTokenCache import net.mullvad.mullvadvpn.ui.serviceconnection.KeyStatusListener class KeyStatusNotification( context: Context, - daemon: MullvadDaemon, + authTokenCache: AuthTokenCache, private val keyStatusListener: KeyStatusListener -) : NotificationWithUrlWithToken(context, daemon, R.string.wg_key_url) { +) : NotificationWithUrlWithToken(context, authTokenCache, R.string.wg_key_url) { private val failedToGenerateKey = context.getString(R.string.failed_to_generate_key) private val tooManyKeys = context.getString(R.string.too_many_keys) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrlWithToken.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrlWithToken.kt index 2c8c713a83..6afd54840c 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrlWithToken.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/NotificationWithUrlWithToken.kt @@ -3,11 +3,11 @@ package net.mullvad.mullvadvpn.ui.notification import android.content.Context import android.content.Intent import android.net.Uri -import net.mullvad.mullvadvpn.service.MullvadDaemon +import net.mullvad.mullvadvpn.ui.serviceconnection.AuthTokenCache abstract class NotificationWithUrlWithToken( protected val context: Context, - protected val daemon: MullvadDaemon, + protected val authTokenCache: AuthTokenCache, urlId: Int ) : InAppNotification() { private val url = context.getString(urlId) @@ -21,5 +21,5 @@ abstract class NotificationWithUrlWithToken( showIcon = true } - private fun buildUrl() = Uri.parse("$url?token=${daemon.getWwwAuthToken()}") + private suspend fun buildUrl() = Uri.parse("$url?token=${authTokenCache.fetchAuthToken()}") } |