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

Fixes

Browse Source
This commit is contained in:
Mygod
2022-07-15 23:37:50 -04:00
parent 1621d6624a
commit ed2426f77e
3 changed files with 65 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -187,7 +187,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
MacAddressCompat.fromString(dialogView.persistentRandomizedMac.text.toString()).toPlatform() MacAddressCompat.fromString(dialogView.persistentRandomizedMac.text.toString()).toPlatform()
} else null } else null
allowedAcsChannels = acsList.associate { (band, text, _) -> band to RangeInput.fromString(text.text) } 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.readOnly) dialogView.bssid.addTextChangedListener(this@WifiApDialogFragment)
if (arg.p2pMode) dialogView.hiddenSsid.isGone = true if (arg.p2pMode) dialogView.hiddenSsid.isGone = true
if (arg.p2pMode && Build.VERSION.SDK_INT >= 29) dialogView.macRandomization.isEnabled = false 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) { if (arg.p2pMode || Build.VERSION.SDK_INT < 31) {
dialogView.ieee80211ax.isGone = true dialogView.ieee80211ax.isGone = true
dialogView.bridgedModeOpportunisticShutdown.isGone = true dialogView.bridgedModeOpportunisticShutdown.isGone = true
@@ -275,7 +275,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
dialogView.bridgedTimeout.isEnabled = false dialogView.bridgedTimeout.isEnabled = false
dialogView.persistentRandomizedMacWrapper.isGone = true dialogView.persistentRandomizedMacWrapper.isGone = true
for ((_, _, wrapper) in acsList) wrapper.isGone = true for ((_, _, wrapper) in acsList) wrapper.isGone = true
dialogView.maxChannelBandwidth.isGone = true dialogView.maxChannelBandwidthWrapper.isGone = true
} else { } else {
dialogView.maxChannelBandwidth.adapter = ArrayAdapter(activity, android.R.layout.simple_spinner_item, 0, dialogView.maxChannelBandwidth.adapter = ArrayAdapter(activity, android.R.layout.simple_spinner_item, 0,
bandWidthOptions).apply { bandWidthOptions).apply {

4
mobile/src/main/java/be/mygod/vpnhotspot/util/RangeInput.kt
View File

@@ -30,7 +30,9 @@ object RangeInput {
if (input == null) return@apply if (input == null) return@apply
for (unit in input.split(',')) { for (unit in input.split(',')) {
if (unit.isBlank()) continue 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]}" } require(blocks[0] in min..max) { "Out of range: ${blocks[0]}" }
if (blocks.size == 2) { if (blocks.size == 2) {
require(blocks[1] in min..max) { "Out of range: ${blocks[1]}" } require(blocks[1] in min..max) { "Out of range: ${blocks[1]}" }

104
mobile/src/main/res/layout/dialog_wifi_ap.xml
View File

@@ -233,28 +233,35 @@
android:imeOptions="flagForceAscii" android:imeOptions="flagForceAscii"
android:inputType="textNoSuggestions" /> android:inputType="textNoSuggestions" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<TextView <LinearLayout
android:layout_width="match_parent" android:id="@+id/max_channel_bandwidth_wrapper"
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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dip" android:layout_marginTop="8dip"
android:paddingStart="8dp" android:orientation="vertical">
android:textAppearance="@style/TextAppearance.Design.Error" <TextView
android:visibility="gone" android:layout_width="match_parent"
tools:text="error text placeholder" android:layout_height="wrap_content"
tools:visibility="visible"/> 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>
<LinearLayout <LinearLayout
@@ -360,37 +367,44 @@
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions"
android:maxLength="17" /> android:maxLength="17" />
</com.google.android.material.textfield.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
<TextView <LinearLayout
android:layout_width="match_parent" android:id="@+id/mac_randomization_wrapper"
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"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dip" android:layout_marginTop="8dip"
app:counterEnabled="true" android:orientation="vertical">
app:counterMaxLength="17" <TextView
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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/wifi_item_edit_content" style="@style/wifi_item_label"
android:imeOptions="flagForceAscii" android:text="@string/wifi_mac_randomization" />
android:inputType="textNoSuggestions" <Spinner
android:maxLength="17" /> android:id="@+id/mac_randomization"
</com.google.android.material.textfield.TextInputLayout> 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 <com.google.android.material.materialswitch.MaterialSwitch
android:id="@+id/hidden_ssid" android:id="@+id/hidden_ssid"
style="@style/wifi_item_label" style="@style/wifi_item_label"