summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-01-06 13:59:57 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2021-04-13 17:21:48 +0000
commit110c0e725fd6385a0ec3d792ea5a8c7a17dda47a (patch)
tree5498f24b2312a5f465c2f69554c27667fd80b0a4
parent4eb3f92a239efbd0a62f99e00ba0e4443b1e2cef (diff)
downloadmullvadvpn-110c0e725fd6385a0ec3d792ea5a8c7a17dda47a.tar.xz
mullvadvpn-110c0e725fd6385a0ec3d792ea5a8c7a17dda47a.zip
Replace two methods with a single method
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/CustomDns.kt22
1 files changed, 5 insertions, 17 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/CustomDns.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/CustomDns.kt
index ba3c1f3dd7..a5249864ae 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/CustomDns.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/CustomDns.kt
@@ -36,11 +36,7 @@ class CustomDns(private val endpoint: ServiceEndpoint) {
}
registerHandler(Request.SetEnableCustomDns::class) { request ->
- if (request.enable) {
- enable()
- } else {
- disable()
- }
+ setEnabled(request.enable)
}
}
}
@@ -49,18 +45,6 @@ class CustomDns(private val endpoint: ServiceEndpoint) {
endpoint.settingsListener.dnsOptionsNotifier.unsubscribe(this)
}
- fun enable() {
- synchronized(this) {
- changeDnsOptions(true, dnsServers)
- }
- }
-
- fun disable() {
- synchronized(this) {
- changeDnsOptions(false, dnsServers)
- }
- }
-
fun addDnsServer(server: InetAddress): Boolean {
synchronized(this) {
if (!dnsServers.contains(server)) {
@@ -102,6 +86,10 @@ class CustomDns(private val endpoint: ServiceEndpoint) {
}
}
+ fun setEnabled(enable: Boolean) {
+ changeDnsOptions(enable, dnsServers)
+ }
+
private fun changeDnsOptions(enable: Boolean, dnsServers: ArrayList<InetAddress>) {
val options = DnsOptions(enable, dnsServers)