diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-01-05 21:17:30 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-04-13 17:21:48 +0000 |
| commit | 44b1c1d91a29994a8fc1363f8b18f8ff1627d3dc (patch) | |
| tree | f30e1dd513b5a03e6b1477d4923725407c57700a /android/src | |
| parent | c41fa80e5d83299a6cdfb0fde51725538d63134b (diff) | |
| download | mullvadvpn-44b1c1d91a29994a8fc1363f8b18f8ff1627d3dc.tar.xz mullvadvpn-44b1c1d91a29994a8fc1363f8b18f8ff1627d3dc.zip | |
Use UI-side `CustomDns` management class
Diffstat (limited to 'android/src')
3 files changed, 4 insertions, 3 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt index 1927a0490f..fbb09689ca 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt @@ -7,10 +7,10 @@ import android.view.ViewGroup import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.dataproxy.AppVersionInfoCache import net.mullvad.mullvadvpn.dataproxy.RelayListListener -import net.mullvad.mullvadvpn.service.CustomDns import net.mullvad.mullvadvpn.service.MullvadDaemon import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache import net.mullvad.mullvadvpn.ui.serviceconnection.ConnectionProxy +import net.mullvad.mullvadvpn.ui.serviceconnection.CustomDns import net.mullvad.mullvadvpn.ui.serviceconnection.KeyStatusListener import net.mullvad.mullvadvpn.ui.serviceconnection.LocationInfoCache import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnection diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt index c66fc04848..8b0ce3b48b 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsAdapter.kt @@ -8,7 +8,7 @@ import kotlin.properties.Delegates.observable import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.service.CustomDns +import net.mullvad.mullvadvpn.ui.serviceconnection.CustomDns import net.mullvad.mullvadvpn.util.JobTracker import org.apache.commons.validator.routines.InetAddressValidator diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt index 6e2cee704f..e3b02a3bb8 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt @@ -30,7 +30,6 @@ class ServiceConnection(private val service: ServiceInstance, mainActivity: Main val daemon = service.daemon val accountCache = AccountCache(service.messenger, dispatcher) val connectionProxy = ConnectionProxy(service.messenger, dispatcher) - val customDns = service.customDns val keyStatusListener = KeyStatusListener(service.messenger, dispatcher) val locationInfoCache = LocationInfoCache(dispatcher) val settingsListener = SettingsListener(dispatcher) @@ -40,6 +39,7 @@ class ServiceConnection(private val service: ServiceInstance, mainActivity: Main val vpnPermission = VpnPermission(service.messenger) val appVersionInfoCache = AppVersionInfoCache(mainActivity, daemon, settingsListener) + val customDns = CustomDns(service.messenger, settingsListener) var relayListListener = RelayListListener(daemon, settingsListener) init { @@ -57,6 +57,7 @@ class ServiceConnection(private val service: ServiceInstance, mainActivity: Main settingsListener.onDestroy() appVersionInfoCache.onDestroy() + customDns.onDestroy() relayListListener.onDestroy() } |