From 44caba4d33dad617a329929ae81dfd73c5714403 Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Sat, 16 Jul 2022 10:36:48 -0400
Subject: [PATCH] Remove useless setUserConfiguration

---
 README.md                                       |  1 -
 .../net/wifi/SoftApConfigurationCompat.kt       |  9 +--------
 .../be/mygod/vpnhotspot/util/UnblockCentral.kt  |  5 -----
 mobile/src/main/res/layout/dialog_wifi_ap.xml   | 17 +++++++++--------
 4 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index d0b9ad51..3bcd46c8 100644
--- a/README.md
+++ b/README.md
@@ -161,7 +161,6 @@ Greylisted/blacklisted APIs or internal constants: (some constants are hardcoded
 * (since API 30) `Landroid/net/TetheringManager$TetheringEventCallback;->onTetherableInterfaceRegexpsChanged(Landroid/net/TetheringManager$TetheringInterfaceRegexps;)V,blocked`
 * (since API 31) `Landroid/net/wifi/SoftApCapability;->getCountryCode()Ljava/lang/String;,blocked`
 * (since API 33) `Landroid/net/wifi/SoftApConfiguration$Builder;->setRandomizedMacAddress(Landroid/net/MacAddress;)Landroid/net/wifi/SoftApConfiguration$Builder;,blocked`
-* (since API 31) `Landroid/net/wifi/SoftApConfiguration$Builder;->setUserConfiguration(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,blocked`
 * (since API 31) `Landroid/net/wifi/SoftApConfiguration;->BAND_TYPES:[I,blocked`
 * (since API 31) `Landroid/net/wifi/SoftApInfo;->getApInstanceIdentifier()Ljava/lang/String;,blocked`
 * (since API 31) `Landroid/net/wifi/WifiClient;->getApInstanceIdentifier()Ljava/lang/String;,blocked`
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 d907c621..5ce17e2d 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
@@ -348,8 +348,6 @@ data class SoftApConfigurationCompat(
         }
         @get:RequiresApi(30)
         private val setSsid by lazy @TargetApi(30) { classBuilder.getDeclaredMethod("setSsid", String::class.java) }
-        @get:RequiresApi(31)
-        private val setUserConfiguration by lazy @TargetApi(31) { UnblockCentral.setUserConfiguration(classBuilder) }
         @get:RequiresApi(33)
         private val setVendorElements by lazy @TargetApi(33) {
             classBuilder.getDeclaredMethod("setVendorElements", java.util.List::class.java)
@@ -556,13 +554,8 @@ data class SoftApConfigurationCompat(
             setMacRandomizationSetting(builder, macRandomizationSetting)
             setBridgedModeOpportunisticShutdownEnabled(builder, isBridgedModeOpportunisticShutdownEnabled)
             setIeee80211axEnabled(builder, isIeee80211axEnabled)
-            if (Build.VERSION.SDK_INT >= 33) setIeee80211beEnabled(builder, isIeee80211beEnabled)
-            if (sac?.let { isUserConfiguration(it) as Boolean } != false != isUserConfiguration) try {
-                setUserConfiguration(builder, isUserConfiguration)
-            } catch (e: ReflectiveOperationException) {
-                Timber.w(e) // as far as we are concerned, this field is not used anywhere so ignore for now
-            }
             if (Build.VERSION.SDK_INT >= 33) {
+                setIeee80211beEnabled(builder, isIeee80211beEnabled)
                 setBridgedModeOpportunisticShutdownTimeoutMillis(builder, bridgedModeOpportunisticShutdownTimeoutMillis)
                 setVendorElements(builder, vendorElements)
                 if (sac?.let { getPersistentRandomizedMacAddress(it) as MacAddress } !=
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/util/UnblockCentral.kt b/mobile/src/main/java/be/mygod/vpnhotspot/util/UnblockCentral.kt
index ae384c83..cc1807b3 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/util/UnblockCentral.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/util/UnblockCentral.kt
@@ -30,11 +30,6 @@ object UnblockCentral {
         clazz.getDeclaredMethod("setRandomizedMacAddress", MacAddress::class.java)
     }
 
-    @RequiresApi(31)
-    fun setUserConfiguration(clazz: Class<*>) = init.let {
-        clazz.getDeclaredMethod("setUserConfiguration", Boolean::class.java)
-    }
-
     @get:RequiresApi(31)
     val SoftApConfiguration_BAND_TYPES get() = init.let {
         SoftApConfiguration::class.java.getDeclaredField("BAND_TYPES").get(null) as IntArray
diff --git a/mobile/src/main/res/layout/dialog_wifi_ap.xml b/mobile/src/main/res/layout/dialog_wifi_ap.xml
index 48e9c19c..433bc4fa 100644
--- a/mobile/src/main/res/layout/dialog_wifi_ap.xml
+++ b/mobile/src/main/res/layout/dialog_wifi_ap.xml
@@ -429,14 +429,6 @@
                     android:layout_marginTop="8dip"
                     android:minHeight="@dimen/touch_target_min"
                     android:text="@string/wifi_ieee_80211be" />
-                <com.google.android.material.materialswitch.MaterialSwitch
-                    android:id="@+id/user_config"
-                    style="@style/wifi_item_label"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dip"
-                    android:minHeight="@dimen/touch_target_min"
-                    android:text="@string/wifi_user_config" />
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/vendor_elements_wrapper"
                     android:layout_width="match_parent"
@@ -452,6 +444,15 @@
                         android:imeOptions="flagForceAscii"
                         android:inputType="textMultiLine|textNoSuggestions" />
                 </com.google.android.material.textfield.TextInputLayout>
+                <com.google.android.material.materialswitch.MaterialSwitch
+                    android:id="@+id/user_config"
+                    style="@style/wifi_item_label"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dip"
+                    android:enabled="false"
+                    android:minHeight="@dimen/touch_target_min"
+                    android:text="@string/wifi_user_config" />
             </LinearLayout>
         </LinearLayout>
     </ScrollView>