Merge branch 'fix-custom-dns-text-watcher-crash'

1 files changed, 29 insertions, 12 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/EditCustomDnsServerHolder.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/EditCustomDnsServerHolder.kt
index 560bfb22d8..7e525bc4fe 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/EditCustomDnsServerHolder.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/customdns/EditCustomDnsServerHolder.kt
@@ -11,9 +11,13 @@ import net.mullvad.mullvadvpn.R
 import net.mullvad.talpid.util.addressString
 
 class EditCustomDnsServerHolder(view: View, adapter: CustomDnsAdapter) : CustomDnsItemHolder(view) {
-    private val context = view.context
-    private val errorColor = context.getColor(R.color.red)
-    private val normalColor = context.getColor(R.color.blue)
+    private enum class State {
+        Normal,
+        Error,
+    }
+
+    private val errorColor = view.context.getColor(R.color.red)
+    private val normalColor = view.context.getColor(R.color.blue)
 
     private val input: EditText = view.findViewById<EditText>(R.id.input).apply {
         onFocusChangeListener = OnFocusChangeListener { _, hasFocus ->
@@ -25,17 +29,33 @@ class EditCustomDnsServerHolder(view: View, adapter: CustomDnsAdapter) : CustomD
         }
     }
 
-    private val watcher = object : TextWatcher {
+    private val watcher: TextWatcher = object : TextWatcher {
         override fun beforeTextChanged(text: CharSequence, start: Int, count: Int, after: Int) {}
 
         override fun afterTextChanged(text: Editable) {
-            input.setTextColor(normalColor)
-            input.removeTextChangedListener(this)
+            state = State.Normal
         }
 
         override fun onTextChanged(text: CharSequence, start: Int, before: Int, count: Int) {}
     }
 
+    private var state by observable(State.Normal) { _, oldState, newState ->
+        if (oldState != newState) {
+            input.apply {
+                when (newState) {
+                    State.Normal -> {
+                        setTextColor(normalColor)
+                        removeTextChangedListener(watcher)
+                    }
+                    State.Error -> {
+                        setTextColor(errorColor)
+                        addTextChangedListener(watcher)
+                    }
+                }
+            }
+        }
+    }
+
     var serverAddress by observable<InetAddress?>(null) { _, _, address ->
         if (address != null) {
             val addressString = address.addressString()
@@ -51,12 +71,9 @@ class EditCustomDnsServerHolder(view: View, adapter: CustomDnsAdapter) : CustomD
 
     init {
         view.findViewById<View>(R.id.save).setOnClickListener {
-            adapter.saveDnsServer(input.text.toString()) {
-                input.apply {
-                    setTextColor(errorColor)
-                    addTextChangedListener(watcher)
-                }
-            }
+            val onFailCallback = { state = State.Error }
+
+            adapter.saveDnsServer(input.text.toString(), onFailCallback)
         }
     }
 }