diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-01-25 17:57:05 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-02-11 14:36:18 +0000 |
| commit | 81feefb00b58ef1489d72f2b99e2a333cdab1283 (patch) | |
| tree | 84b9a5681ebdf9469d5869ddbe973b3dd4804cf2 | |
| parent | 9016856769dad19513f87c6a092aace8efaf947b (diff) | |
| download | mullvadvpn-81feefb00b58ef1489d72f2b99e2a333cdab1283.tar.xz mullvadvpn-81feefb00b58ef1489d72f2b99e2a333cdab1283.zip | |
Register listener instead using parameter
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt | 3 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt index 6f89462bbe..a69715653b 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/DaemonInstance.kt @@ -14,7 +14,7 @@ import net.mullvad.mullvadvpn.util.Intermittent private const val API_IP_ADDRESS_FILE = "api-ip-address.txt" private const val RELAYS_FILE = "relays.json" -class DaemonInstance(val vpnService: MullvadVpnService, val listener: (MullvadDaemon?) -> Unit) { +class DaemonInstance(val vpnService: MullvadVpnService) { private enum class Command { START, STOP, @@ -24,7 +24,6 @@ class DaemonInstance(val vpnService: MullvadVpnService, val listener: (MullvadDa private var daemon by observable<MullvadDaemon?>(null) { _, oldInstance, _ -> oldInstance?.onDestroy() - listener(newInstance) } val intermittentDaemon = Intermittent<MullvadDaemon>() 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 4f1f291026..052f65ebd3 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -104,11 +104,13 @@ class MullvadVpnService : TalpidVpnService() { notificationManager.acknowledgeStartForegroundService() - daemonInstance = DaemonInstance(this) { daemon -> - handleDaemonInstance(daemon) - } + daemonInstance = DaemonInstance(this).apply { + intermittentDaemon.registerListener(this@MullvadVpnService) { daemon -> + handleDaemonInstance(daemon) + } - daemonInstance.start() + start() + } } override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { |