From bef36d08898e78c434a913b13ce682f00f96fb87 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Fri, 8 Oct 2021 01:02:21 -0400
Subject: [PATCH] Fix SSID length detection and error UI

---
 .../be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt
index 2b4e1df1..e7f1516a 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt
@@ -283,9 +283,10 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
     private fun validate() {
         if (!started) return
         val ssidLength = dialogView.ssid.text.toString().toByteArray().size
+        val ssidLengthOk = ssidLength in 1..32
         dialogView.ssidWrapper.error = if (arg.p2pMode && RepeaterService.safeMode && ssidLength < 9) {
             requireContext().getString(R.string.settings_service_repeater_safe_mode_warning)
-        } else null
+        } else if (ssidLengthOk) null else " "
         val selectedSecurity = if (arg.p2pMode) {
             SoftApConfiguration.SECURITY_TYPE_WPA2_PSK
         } else dialogView.security.selectedItemPosition
@@ -368,7 +369,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
         } else true
         val canCopy = timeoutError == null && bssidValid && maxClientError == null && listsNoError
         (dialog as? AlertDialog)?.getButton(DialogInterface.BUTTON_POSITIVE)?.isEnabled =
-                ssidLength in 1..32 && passwordValid && bandError == null && canCopy
+                ssidLengthOk && passwordValid && bandError == null && canCopy
         dialogView.toolbar.menu.findItem(android.R.id.copy).isEnabled = canCopy
     }