brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SSID length detection and error UI

Browse Source
This commit is contained in:
Mygod
2021-10-08 01:02:21 -04:00
parent 1426d4e3a3
commit bef36d0889
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt
View File

@@ -283,9 +283,10 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
private fun validate() { private fun validate() {
if (!started) return if (!started) return
val ssidLength = dialogView.ssid.text.toString().toByteArray().size val ssidLength = dialogView.ssid.text.toString().toByteArray().size
val ssidLengthOk = ssidLength in 1..32
dialogView.ssidWrapper.error = if (arg.p2pMode && RepeaterService.safeMode && ssidLength < 9) { dialogView.ssidWrapper.error = if (arg.p2pMode && RepeaterService.safeMode && ssidLength < 9) {
requireContext().getString(R.string.settings_service_repeater_safe_mode_warning) requireContext().getString(R.string.settings_service_repeater_safe_mode_warning)
} else null } else if (ssidLengthOk) null else " "
val selectedSecurity = if (arg.p2pMode) { val selectedSecurity = if (arg.p2pMode) {
SoftApConfiguration.SECURITY_TYPE_WPA2_PSK SoftApConfiguration.SECURITY_TYPE_WPA2_PSK
} else dialogView.security.selectedItemPosition } else dialogView.security.selectedItemPosition
@@ -368,7 +369,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
} else true } else true
val canCopy = timeoutError == null && bssidValid && maxClientError == null && listsNoError val canCopy = timeoutError == null && bssidValid && maxClientError == null && listsNoError
(dialog as? AlertDialog)?.getButton(DialogInterface.BUTTON_POSITIVE)?.isEnabled = (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 dialogView.toolbar.menu.findItem(android.R.id.copy).isEnabled = canCopy
} }