diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-12-16 18:34:03 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-31 14:36:30 +0000 |
| commit | b182bd6bced0817813ecc80fb95186d5490c0c43 (patch) | |
| tree | 9eeeef83ab5516fc7736903511a7e31f19877d8a /android/src | |
| parent | 0bcea062916c317ccc9aa2ea065623d36d108780 (diff) | |
| download | mullvadvpn-b182bd6bced0817813ecc80fb95186d5490c0c43.tar.xz mullvadvpn-b182bd6bced0817813ecc80fb95186d5490c0c43.zip | |
Set notification manager's account listener
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt | 9 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt index 888b0b77e6..7138e0ebae 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt @@ -43,10 +43,6 @@ class ForegroundNotificationManager( } } - private var accountNumberEvents by autoSubscribable<String?>(this, null) { accountNumber -> - loggedIn = accountNumber != null - } - private var tunnelStateEvents by autoSubscribable<TunnelState>( this, TunnelState.Disconnected @@ -68,6 +64,10 @@ class ForegroundNotificationManager( private val shouldBeOnForeground get() = lockedToForeground || !(tunnelState is TunnelState.Disconnected) + var accountNumberEvents by autoSubscribable<String?>(this, null) { accountNumber -> + loggedIn = accountNumber != null + } + var onForeground = false private set @@ -77,7 +77,6 @@ class ForegroundNotificationManager( init { serviceNotifier.subscribe(this) { newServiceInstance -> - accountNumberEvents = newServiceInstance?.settingsListener?.accountNumberNotifier tunnelStateEvents = newServiceInstance?.connectionProxy?.onStateChange } 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 bbc9ab209b..f4acd8b948 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -239,6 +239,8 @@ class MullvadVpnService : TalpidVpnService() { val customDns = CustomDns(daemon, endpoint.settingsListener) val splitTunneling = splitTunneling.await() + notificationManager.accountNumberEvents = endpoint.settingsListener.accountNumberNotifier + splitTunneling.onChange = { excludedApps -> disallowedApps = excludedApps markTunAsStale() |