Deprecate dns add/remove/replace ipc actions

2 files changed, 8 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 6c7745da9a..57dcd1bc98 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
@@ -12,6 +12,7 @@ sealed class Request : Message.RequestMessage() {
     protected override val messageKey = MESSAGE_KEY
 
     @Parcelize
+    @Deprecated("Use SetDnsOptions")
     data class AddCustomDnsServer(val address: InetAddress) : Request()
 
     @Parcelize
@@ -69,9 +70,11 @@ sealed class Request : Message.RequestMessage() {
     object ClearAccountHistory : Request()
 
     @Parcelize
+    @Deprecated("Use SetDnsOptions")
     data class RemoveCustomDnsServer(val address: InetAddress) : Request()
 
     @Parcelize
+    @Deprecated("Use SetDnsOptions")
     data class ReplaceCustomDnsServer(
         val oldAddress: InetAddress,
         val newAddress: InetAddress
@@ -84,6 +87,7 @@ sealed class Request : Message.RequestMessage() {
     data class SetAutoConnect(val autoConnect: Boolean) : Request()
 
     @Parcelize
+    @Deprecated("Use SetDnsOptions")
     data class SetEnableCustomDns(val enable: Boolean) : Request()
 
     @Parcelize
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 81a0d8e7aa..62943ee0cb 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
@@ -15,9 +15,13 @@ import net.mullvad.mullvadvpn.model.DnsState
 
 class CustomDns(private val endpoint: ServiceEndpoint) {
     private sealed class Command {
+        @Deprecated("Use SetDnsOptions")
         class AddDnsServer(val server: InetAddress) : Command()
+        @Deprecated("Use SetDnsOptions")
         class RemoveDnsServer(val server: InetAddress) : Command()
+        @Deprecated("Use SetDnsOptions")
         class ReplaceDnsServer(val oldServer: InetAddress, val newServer: InetAddress) : Command()
+        @Deprecated("Use SetDnsOptions")
         class SetEnabled(val enabled: Boolean) : Command()
 
         class SetDnsOptions(val dnsOptions: DnsOptions) : Command()