Add IPC option to set DnsOptions

This makes it possible to submit the DnsOptions as a whole rather
than separate actions add/remove/replace.

2 files changed, 15 insertions, 0 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt
index 9584aee506..6c7745da9a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ipc/Request.kt
@@ -4,6 +4,7 @@ import android.os.Message as RawMessage
 import android.os.Messenger
 import java.net.InetAddress
 import kotlinx.parcelize.Parcelize
+import net.mullvad.mullvadvpn.model.DnsOptions
 import net.mullvad.mullvadvpn.model.LocationConstraint
 
 // Requests that the service can handle
@@ -103,6 +104,9 @@ sealed class Request : Message.RequestMessage() {
     @Parcelize
     data class VpnPermissionResponse(val isGranted: Boolean) : Request()
 
+    @Parcelize
+    data class SetDnsOptions(val dnsOptions: DnsOptions) : Request()
+
     companion object {
         private const val MESSAGE_KEY = "request"
 
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomDns.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomDns.kt
index b2ae560450..81a0d8e7aa 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomDns.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/endpoint/CustomDns.kt
@@ -19,6 +19,8 @@ class CustomDns(private val endpoint: ServiceEndpoint) {
         class RemoveDnsServer(val server: InetAddress) : Command()
         class ReplaceDnsServer(val oldServer: InetAddress, val newServer: InetAddress) : Command()
         class SetEnabled(val enabled: Boolean) : Command()
+
+        class SetDnsOptions(val dnsOptions: DnsOptions) : Command()
     }
 
     private val commandChannel = spawnActor()
@@ -56,6 +58,10 @@ class CustomDns(private val endpoint: ServiceEndpoint) {
             registerHandler(Request.SetEnableCustomDns::class) { request ->
                 commandChannel.trySendBlocking(Command.SetEnabled(request.enable))
             }
+
+            registerHandler(Request.SetDnsOptions::class) { request ->
+                commandChannel.trySendBlocking(Command.SetDnsOptions(request.dnsOptions))
+            }
         }
     }
 
@@ -76,6 +82,7 @@ class CustomDns(private val endpoint: ServiceEndpoint) {
                         doReplaceDnsServer(command.oldServer, command.newServer)
                     }
                     is Command.SetEnabled -> changeDnsOptions(command.enabled)
+                    is Command.SetDnsOptions -> setDnsOptions(command.dnsOptions)
                 }
             }
         } catch (exception: ClosedReceiveChannelException) {
@@ -116,4 +123,8 @@ class CustomDns(private val endpoint: ServiceEndpoint) {
         )
         daemon.await().setDnsOptions(options)
     }
+
+    private suspend fun setDnsOptions(dnsOptions: DnsOptions) {
+        daemon.await().setDnsOptions(dnsOptions)
+    }
 }