From ed2426f77e3c0dea3e0dd2198ca69470f0534c42 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Fri, 15 Jul 2022 23:37:50 -0400
Subject: [PATCH] Fixes

---
 .../net/wifi/WifiApDialogFragment.kt          |   6 +-
 .../be/mygod/vpnhotspot/util/RangeInput.kt    |   4 +-
 mobile/src/main/res/layout/dialog_wifi_ap.xml | 104 ++++++++++--------
 3 files changed, 65 insertions(+), 49 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 db279135..09606980 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
@@ -187,7 +187,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
                 MacAddressCompat.fromString(dialogView.persistentRandomizedMac.text.toString()).toPlatform()
             } else null
             allowedAcsChannels = acsList.associate { (band, text, _) -> band to RangeInput.fromString(text.text) }
-            maxChannelBandwidth = dialogView.maxChannelBandwidth.selectedItemId.toInt()
+            maxChannelBandwidth = (dialogView.maxChannelBandwidth.selectedItem as BandWidth).width
         }
     }
 
@@ -258,7 +258,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
         if (!arg.readOnly) dialogView.bssid.addTextChangedListener(this@WifiApDialogFragment)
         if (arg.p2pMode) dialogView.hiddenSsid.isGone = true
         if (arg.p2pMode && Build.VERSION.SDK_INT >= 29) dialogView.macRandomization.isEnabled = false
-        else if (arg.p2pMode || Build.VERSION.SDK_INT < 31) dialogView.macRandomization.isGone = true
+        else if (arg.p2pMode || Build.VERSION.SDK_INT < 31) dialogView.macRandomizationWrapper.isGone = true
         if (arg.p2pMode || Build.VERSION.SDK_INT < 31) {
             dialogView.ieee80211ax.isGone = true
             dialogView.bridgedModeOpportunisticShutdown.isGone = true
@@ -275,7 +275,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
             dialogView.bridgedTimeout.isEnabled = false
             dialogView.persistentRandomizedMacWrapper.isGone = true
             for ((_, _, wrapper) in acsList) wrapper.isGone = true
-            dialogView.maxChannelBandwidth.isGone = true
+            dialogView.maxChannelBandwidthWrapper.isGone = true
         } else {
             dialogView.maxChannelBandwidth.adapter = ArrayAdapter(activity, android.R.layout.simple_spinner_item, 0,
                 bandWidthOptions).apply {
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/util/RangeInput.kt b/mobile/src/main/java/be/mygod/vpnhotspot/util/RangeInput.kt
index 1029507e..d14ae02d 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/util/RangeInput.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/util/RangeInput.kt
@@ -30,7 +30,9 @@ object RangeInput {
         if (input == null) return@apply
         for (unit in input.split(',')) {
             if (unit.isBlank()) continue
-            val blocks = unit.split('-', limit = 2).map { it.trim().toInt() }
+            val blocks = unit.split('-', limit = 2).map { i ->
+                i.trim { it == '\u200b' || it.isWhitespace() }.toInt()
+            }
             require(blocks[0] in min..max) { "Out of range: ${blocks[0]}" }
             if (blocks.size == 2) {
                 require(blocks[1] in min..max) { "Out of range: ${blocks[1]}" }
diff --git a/mobile/src/main/res/layout/dialog_wifi_ap.xml b/mobile/src/main/res/layout/dialog_wifi_ap.xml
index a2db780c..48e9c19c 100644
--- a/mobile/src/main/res/layout/dialog_wifi_ap.xml
+++ b/mobile/src/main/res/layout/dialog_wifi_ap.xml
@@ -233,28 +233,35 @@
                         android:imeOptions="flagForceAscii"
                         android:inputType="textNoSuggestions" />
                 </com.google.android.material.textfield.TextInputLayout>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item_label"
-                    android:text="@string/wifi_hotspot_max_channel_bandwidth" />
-                <Spinner
-                    android:id="@+id/max_channel_bandwidth"
-                    style="@style/wifi_item_content"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:minHeight="@dimen/touch_target_min"
-                    android:prompt="@string/wifi_hotspot_max_channel_bandwidth" />
-                <TextView
-                    android:id="@+id/max_channel_bandwidth_error"
+                <LinearLayout
+                    android:id="@+id/max_channel_bandwidth_wrapper"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dip"
-                    android:paddingStart="8dp"
-                    android:textAppearance="@style/TextAppearance.Design.Error"
-                    android:visibility="gone"
-                    tools:text="error text placeholder"
-                    tools:visibility="visible"/>
+                    android:orientation="vertical">
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        style="@style/wifi_item_label"
+                        android:text="@string/wifi_hotspot_max_channel_bandwidth" />
+                    <Spinner
+                        android:id="@+id/max_channel_bandwidth"
+                        style="@style/wifi_item_content"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:minHeight="@dimen/touch_target_min"
+                        android:prompt="@string/wifi_hotspot_max_channel_bandwidth" />
+                    <TextView
+                        android:id="@+id/max_channel_bandwidth_error"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dip"
+                        android:paddingStart="8dp"
+                        android:textAppearance="@style/TextAppearance.Design.Error"
+                        android:visibility="gone"
+                        tools:text="error text placeholder"
+                        tools:visibility="visible"/>
+                </LinearLayout>
             </LinearLayout>
 
             <LinearLayout
@@ -360,37 +367,44 @@
                         android:inputType="textNoSuggestions"
                         android:maxLength="17" />
                 </com.google.android.material.textfield.TextInputLayout>
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    style="@style/wifi_item_label"
-                    android:text="@string/wifi_mac_randomization" />
-                <Spinner
-                    android:id="@+id/mac_randomization"
-                    style="@style/wifi_item_content"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:minHeight="@dimen/touch_target_min"
-                    android:entries="@array/wifi_mac_randomization"
-                    android:prompt="@string/wifi_mac_randomization" />
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/persistent_randomized_mac_wrapper"
+                <LinearLayout
+                    android:id="@+id/mac_randomization_wrapper"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dip"
-                    app:counterEnabled="true"
-                    app:counterMaxLength="17"
-                    app:errorEnabled="true"
-                    android:hint="@string/wifi_advanced_mac_address_persistent_randomized">
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/persistent_randomized_mac"
+                    android:orientation="vertical">
+                    <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="@style/wifi_item_edit_content"
-                        android:imeOptions="flagForceAscii"
-                        android:inputType="textNoSuggestions"
-                        android:maxLength="17" />
-                </com.google.android.material.textfield.TextInputLayout>
+                        style="@style/wifi_item_label"
+                        android:text="@string/wifi_mac_randomization" />
+                    <Spinner
+                        android:id="@+id/mac_randomization"
+                        style="@style/wifi_item_content"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:minHeight="@dimen/touch_target_min"
+                        android:entries="@array/wifi_mac_randomization"
+                        android:prompt="@string/wifi_mac_randomization" />
+                    <com.google.android.material.textfield.TextInputLayout
+                        android:id="@+id/persistent_randomized_mac_wrapper"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dip"
+                        app:counterEnabled="true"
+                        app:counterMaxLength="17"
+                        app:errorEnabled="true"
+                        android:hint="@string/wifi_advanced_mac_address_persistent_randomized">
+                        <com.google.android.material.textfield.TextInputEditText
+                            android:id="@+id/persistent_randomized_mac"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            style="@style/wifi_item_edit_content"
+                            android:imeOptions="flagForceAscii"
+                            android:inputType="textNoSuggestions"
+                            android:maxLength="17" />
+                    </com.google.android.material.textfield.TextInputLayout>
+                </LinearLayout>
                 <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/hidden_ssid"
                     style="@style/wifi_item_label"