summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-05-22 15:10:55 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-05-25 11:51:59 +0000
commit92ae0747c493bd2bc3c74bd1bf71610de3b75722 (patch)
tree8f15838d89f73031cfcd767752fb6b070b9dd249 /android/src
parentaf941dcbd32684430b66ccb07b6df60b71770ad2 (diff)
downloadmullvadvpn-92ae0747c493bd2bc3c74bd1bf71610de3b75722.tar.xz
mullvadvpn-92ae0747c493bd2bc3c74bd1bf71610de3b75722.zip
Use new API in `TunnelStateUpdater`
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/TunnelStateUpdater.kt6
1 files changed, 3 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/TunnelStateUpdater.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/TunnelStateUpdater.kt
index fa55dbd0cf..638a30d333 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/TunnelStateUpdater.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/tunnelstate/TunnelStateUpdater.kt
@@ -12,16 +12,16 @@ class TunnelStateUpdater(context: Context, serviceNotifier: EventNotifier<Servic
private var stateSubscriptionId: Int? = null
init {
- serviceNotifier.subscribe { serviceInstance ->
+ serviceNotifier.subscribe(this) { serviceInstance ->
onNewServiceInstance(serviceInstance)
}
}
private fun onNewServiceInstance(serviceInstance: ServiceInstance?) {
- stateSubscriptionId?.let { id -> connectionProxy?.onStateChange?.unsubscribe(id) }
+ connectionProxy?.onStateChange?.unsubscribe(this)
connectionProxy = serviceInstance?.connectionProxy?.apply {
- stateSubscriptionId = onStateChange.subscribe { newState ->
+ onStateChange.subscribe(this@TunnelStateUpdater) { newState ->
persistence.state = newState
}
}