summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt8
1 files changed, 1 insertions, 7 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
index 38d6a2e3eb..edc0cfd21b 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -42,7 +42,6 @@ class MullvadVpnService : TalpidVpnService() {
private var isStopping = false
private var shouldStop = false
- private var loggedIn = false
private var startDaemonJob: Job? = null
@@ -54,17 +53,12 @@ class MullvadVpnService : TalpidVpnService() {
AccountExpiryNotification(this, daemon)
}
- accountNumberEvents = newInstance?.accountCache?.onAccountNumberChange
accountExpiryEvents = newInstance?.accountCache?.onAccountExpiryChange
serviceNotifier.notify(newInstance)
}
}
- private var accountNumberEvents by autoSubscribable<String?>(this, null) { accountNumber ->
- loggedIn = accountNumber != null
- }
-
private var accountExpiryEvents by autoSubscribable<DateTime?>(this, null) { expiry ->
accountExpiryNotification?.accountExpiry = expiry
}
@@ -235,7 +229,7 @@ class MullvadVpnService : TalpidVpnService() {
val connectionProxy = ConnectionProxy(this, daemon).apply {
when (pendingAction) {
PendingAction.Connect -> {
- if (loggedIn) {
+ if (settings.accountToken != null) {
connect()
} else {
openUi()