diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-10-29 18:37:54 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-12-04 13:18:17 +0000 |
| commit | cc66bc0353207a754c270329f81c404058be44e7 (patch) | |
| tree | b6af16777f4aa49fa43c751409ff8c27f1ab4a63 /android/src | |
| parent | c76918ec8a65c5beb3517d3bf9641b94e6bf0f52 (diff) | |
| download | mullvadvpn-cc66bc0353207a754c270329f81c404058be44e7.tar.xz mullvadvpn-cc66bc0353207a754c270329f81c404058be44e7.zip | |
Create and add `CustomDns` to `ServiceInstance`
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt | 2 |
2 files changed, 4 insertions, 0 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 be49d3723c..1b31605adc 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -226,6 +226,7 @@ class MullvadVpnService : TalpidVpnService() { private suspend fun setUpInstance(daemon: MullvadDaemon, settings: Settings) { val settingsListener = SettingsListener(daemon, settings) val connectionProxy = ConnectionProxy(this, daemon) + val customDns = CustomDns(daemon, settingsListener) val splitTunneling = splitTunneling.await() splitTunneling.onChange = { excludedApps -> @@ -241,6 +242,7 @@ class MullvadVpnService : TalpidVpnService() { daemon, connectionProxy, connectivityListener, + customDns, settingsListener, splitTunneling ) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt index 5ef94a4f5c..135ea9ef28 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt @@ -6,6 +6,7 @@ class ServiceInstance( val daemon: MullvadDaemon, val connectionProxy: ConnectionProxy, val connectivityListener: ConnectivityListener, + val customDns: CustomDns, val settingsListener: SettingsListener, val splitTunneling: SplitTunneling ) { @@ -16,6 +17,7 @@ class ServiceInstance( fun onDestroy() { accountCache.onDestroy() connectionProxy.onDestroy() + customDns.onDestroy() keyStatusListener.onDestroy() locationInfoCache.onDestroy() settingsListener.onDestroy() |