Change how the service knows if user is logged in

1 files changed, 6 insertions, 5 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 b8cfe4a828..f60993fe50 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -152,10 +152,6 @@ class MullvadVpnService : TalpidVpnService() {
         prepareFiles()
 
         val daemon = MullvadDaemon(this@MullvadVpnService).apply {
-            onSettingsChange.subscribe { settings ->
-                loggedIn = settings?.accountToken != null
-            }
-
             onDaemonStopped = {
                 instance = null
 
@@ -206,7 +202,12 @@ class MullvadVpnService : TalpidVpnService() {
         }
 
         val locationInfoCache = LocationInfoCache(daemon, connectionProxy, connectivityListener)
-        val settingsListener = SettingsListener(daemon, settings)
+
+        val settingsListener = SettingsListener(daemon, settings).apply {
+            accountNumberNotifier.subscribe { accountNumber ->
+                loggedIn = accountNumber != null
+            }
+        }
 
         instance = ServiceInstance(
             daemon,