Implement removal of DNS addresses

2 files changed, 16 insertions, 2 deletions

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 f724d4e292..eb35e36005 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
@@ -92,7 +92,7 @@ class CustomDnsAdapter(val customDns: CustomDns) : Adapter<CustomDnsItemHolder>(
             }
             ViewTypes.SHOW_SERVER -> {
                 val view = inflater.inflate(R.layout.custom_dns_server, parentView, false)
-                return CustomDnsServerHolder(view)
+                return CustomDnsServerHolder(view, this)
             }
         }
     }
@@ -127,4 +127,10 @@ class CustomDnsAdapter(val customDns: CustomDns) : Adapter<CustomDnsItemHolder>(
             }
         }
     }
+
+    fun removeDnsServer(address: InetAddress) {
+        jobTracker.newBackgroundJob("removeDnsServer $address") {
+            customDns.removeDnsServer(address)
+        }
+    }
 }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsServerHolder.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsServerHolder.kt
index 42a8a14d94..967077818e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsServerHolder.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/CustomDnsServerHolder.kt
@@ -7,10 +7,18 @@ import kotlin.properties.Delegates.observable
 import net.mullvad.mullvadvpn.R
 import net.mullvad.talpid.util.addressString
 
-class CustomDnsServerHolder(view: View) : CustomDnsItemHolder(view) {
+class CustomDnsServerHolder(view: View, adapter: CustomDnsAdapter) : CustomDnsItemHolder(view) {
     private val label: TextView = view.findViewById(R.id.label)
 
     var serverAddress by observable<InetAddress?>(null) { _, _, address ->
         label.text = address?.addressString() ?: ""
     }
+
+    init {
+        view.findViewById<View>(R.id.remove).setOnClickListener {
+            serverAddress?.let { address ->
+                adapter.removeDnsServer(address)
+            }
+        }
+    }
 }