From c12bd1d6cbd8aaa514ac3bacb031b089872f1bcf Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Thu, 4 Jun 2020 22:47:58 -0400
Subject: [PATCH] Add BSSID UI to dialog

---
 .../net/wifi/WifiApDialogFragment.kt          | 25 +++++++++++++------
 mobile/src/main/res/layout/dialog_wifi_ap.xml | 14 +++++++++++
 2 files changed, 32 insertions(+), 7 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 b4bec538..ad8a5e20 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
@@ -23,10 +23,8 @@ import be.mygod.vpnhotspot.App.Companion.app
 import be.mygod.vpnhotspot.R
 import be.mygod.vpnhotspot.RepeaterService
 import be.mygod.vpnhotspot.databinding.DialogWifiApBinding
-import be.mygod.vpnhotspot.util.QRCodeDialog
-import be.mygod.vpnhotspot.util.showAllowingStateLoss
-import be.mygod.vpnhotspot.util.toByteArray
-import be.mygod.vpnhotspot.util.toParcelable
+import be.mygod.vpnhotspot.net.MacAddressCompat
+import be.mygod.vpnhotspot.util.*
 import be.mygod.vpnhotspot.widget.SmartSnackbar
 import kotlinx.android.parcel.Parcelize
 
@@ -83,7 +81,10 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
     private var started = false
     override val ret get() = Arg(arg.configuration.copy(
             ssid = dialogView.ssid.text.toString(),
-            passphrase = if (dialogView.password.length() != 0) dialogView.password.text.toString() else null).apply {
+            passphrase = if (dialogView.password.length() != 0) dialogView.password.text.toString() else null,
+            bssid = if (dialogView.bssid.length() != 0) {
+                MacAddressCompat.fromString(dialogView.bssid.toString())
+            } else null).apply {
         if (!arg.p2pMode) securityType = dialogView.security.selectedItemPosition
         if (Build.VERSION.SDK_INT >= 23) {
             val bandOption = dialogView.band.selectedItem as BandOption
@@ -138,6 +139,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
                 setSelection(bandOptions.indexOfFirst { it.channel == RepeaterService.operatingChannel })
             }
         } else dialogView.bandWrapper.isGone = true
+        if (!arg.readOnly) dialogView.bssid.addTextChangedListener(this@WifiApDialogFragment)
         populateFromConfiguration(arg.configuration)
     }
 
@@ -150,6 +152,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
                 bandOptions.indexOfFirst { it.channel == configuration.channel }
             } else bandOptions.indexOfFirst { it.band == configuration.band })
         }
+        dialogView.bssid.setText(configuration.bssid?.toString())
         // TODO support more fields from SACC
     }
 
@@ -179,8 +182,16 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
         dialogView.passwordWrapper.error = if (passwordValid) null else {
             requireContext().getString(R.string.credentials_password_too_short)
         }
+        val bssidValid = dialogView.bssid.length() == 0 || try {
+            MacAddressCompat.fromString(dialogView.bssid.text.toString())
+            dialogView.bssidWrapper.error = null
+            true
+        } catch (e: IllegalArgumentException) {
+            dialogView.bssidWrapper.error = e.readableMessage
+            false
+        }
         (dialog as? AlertDialog)?.getButton(DialogInterface.BUTTON_POSITIVE)?.isEnabled =
-                ssidLength in 1..32 && passwordValid
+                ssidLength in 1..32 && passwordValid && bssidValid
     }
 
     override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) { }
@@ -211,7 +222,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
                     SmartSnackbar.make(e).show()
                     return false
                 }
-                QRCodeDialog().withArg(qrString).showAllowingStateLoss(parentFragmentManager, "QRCodeDialog")
+                QRCodeDialog().withArg(qrString).showAllowingStateLoss(parentFragmentManager)
                 true
             }
             else -> false
diff --git a/mobile/src/main/res/layout/dialog_wifi_ap.xml b/mobile/src/main/res/layout/dialog_wifi_ap.xml
index 5932f646..27357735 100644
--- a/mobile/src/main/res/layout/dialog_wifi_ap.xml
+++ b/mobile/src/main/res/layout/dialog_wifi_ap.xml
@@ -107,6 +107,20 @@
                     style="@style/wifi_item_content"
                     android:prompt="@string/wifi_hotspot_ap_band_title" />
             </LinearLayout>
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/bssid_wrapper"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dip"
+                android:hint="BSSID">
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/bssid"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    style="@style/wifi_item_edit_content"
+                    android:inputType="textNoSuggestions"
+                    android:maxLength="17" />
+            </com.google.android.material.textfield.TextInputLayout>
         </LinearLayout>
     </ScrollView>
 </LinearLayout>