summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-12-07 12:59:37 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-12-09 18:42:32 +0000
commitf7082c45e654188f39cf144fdeee60af1358d762 (patch)
tree528afbe27e065b03f2583a818a9528b489da595e /android/src
parent6ffee122bae7506ac7ca78622ea1aea199006e20 (diff)
downloadmullvadvpn-f7082c45e654188f39cf144fdeee60af1358d762.tar.xz
mullvadvpn-f7082c45e654188f39cf144fdeee60af1358d762.zip
Store `DaemonInterface` in `MullvadDaemon` object
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt7
1 files changed, 7 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt
index 33e37f278a..d9f6c17e4f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadDaemon.kt
@@ -12,6 +12,8 @@ import net.mullvad.mullvadvpn.model.TunnelState
import net.mullvad.talpid.util.EventNotifier
class MullvadDaemon(val vpnService: MullvadVpnService) {
+ protected var daemonInterfaceAddress = 0L
+
val onSettingsChange = EventNotifier<Settings?>(null)
var onAppVersionInfoChange: ((AppVersionInfo) -> Unit)? = null
@@ -44,6 +46,7 @@ class MullvadDaemon(val vpnService: MullvadVpnService) {
external fun verifyWireguardKey(): Boolean?
private external fun initialize(vpnService: MullvadVpnService)
+ private external fun deinitialize()
private fun notifyAppVersionInfoEvent(appVersionInfo: AppVersionInfo) {
onAppVersionInfoChange?.invoke(appVersionInfo)
@@ -64,4 +67,8 @@ class MullvadDaemon(val vpnService: MullvadVpnService) {
private fun notifyTunnelStateEvent(event: TunnelState) {
onTunnelStateChange?.invoke(event)
}
+
+ private fun finalize() {
+ deinitialize()
+ }
}