2 files changed, 12 insertions, 0 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
index 12282c30a9..30b9608a9d 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/AdvancedFragment.kt
@@ -206,6 +206,14 @@ class AdvancedFragment : BaseFragment() {
         }
 
         customDnsToggle = view.findViewById<ToggleCell>(R.id.enable_custom_dns).apply {
+            state = serviceConnectionManager.customDns().let { customDns ->
+                if (customDns?.isCustomDnsEnabled() == true) {
+                    CellSwitch.State.ON
+                } else {
+                    CellSwitch.State.OFF
+                }
+            }
+
             listener = { state ->
                 jobTracker.newBackgroundJob("toggleCustomDns") {
                     if (state == CellSwitch.State.ON) {
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/CustomDns.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/CustomDns.kt
index f33c2967fa..2675c1231a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/CustomDns.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/CustomDns.kt
@@ -28,6 +28,10 @@ class CustomDns(private val connection: Messenger, private val settingsListener:
         connection.send(Request.SetEnableCustomDns(false).message)
     }
 
+    fun isCustomDnsEnabled(): Boolean {
+        return onEnabledChanged.latestEvent ?: false
+    }
+
     fun addDnsServer(server: InetAddress): Boolean {
         val didntAlreadyHaveServer = !onDnsServersChanged.latestEvent.contains(server)