From 86a549248ce087bb4361c43a707ae9fb364b6c27 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Sat, 23 Oct 2021 14:23:29 -0400
Subject: [PATCH] Test platform validity of bssid

---
 .../mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt | 2 ++
 .../be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt   | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt
index ab1fb8e8..ae370769 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt
@@ -353,6 +353,8 @@ data class SoftApConfigurationCompat(
         private val staticBuilder by lazy { classBuilder.newInstance() }
         @RequiresApi(30)
         fun testPlatformValidity(channels: SparseIntArray) = setChannelsCompat(staticBuilder, channels)
+        @RequiresApi(30)
+        fun testPlatformValidity(bssid: MacAddress) = setBssid(staticBuilder, bssid)
     }
 
     @Suppress("DEPRECATION")
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 92660c4c..ec709aeb 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
@@ -306,9 +306,12 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
         dialogView.bandError.text = bandError
         dialogView.bssidWrapper.error = null
         val bssidValid = dialogView.bssid.length() == 0 || try {
-            MacAddressCompat.fromString(dialogView.bssid.text.toString())
+            val mac = MacAddressCompat.fromString(dialogView.bssid.text.toString())
+            if (Build.VERSION.SDK_INT >= 30 && !arg.p2pMode) {
+                SoftApConfigurationCompat.testPlatformValidity(mac.toPlatform())
+            }
             true
-        } catch (e: IllegalArgumentException) {
+        } catch (e: Exception) {
             dialogView.bssidWrapper.error = e.readableMessage
             false
         }