Support for Wi-Fi 7

README.md

@@ -260,6 +260,7 @@ Greylisted/blacklisted APIs or internal constants: (some constants are hardcoded
 * (since API 30) `Landroid/net/wifi/SoftApConfiguration$Builder;->setClientControlByUserEnabled(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api`
 * (since API 30) `Landroid/net/wifi/SoftApConfiguration$Builder;->setHiddenSsid(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api`
 * (since API 31) `Landroid/net/wifi/SoftApConfiguration$Builder;->setIeee80211axEnabled(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api`
+* (since API 33) `Landroid/net/wifi/SoftApConfiguration$Builder;->setIeee80211beEnabled(Z)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api`
 * (since API 31) `Landroid/net/wifi/SoftApConfiguration$Builder;->setMacRandomizationSetting(I)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api`
 * (since API 30) `Landroid/net/wifi/SoftApConfiguration$Builder;->setMaxNumberOfClients(I)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api`
 * (since API 30) `Landroid/net/wifi/SoftApConfiguration$Builder;->setPassphrase(Ljava/lang/String;I)Landroid/net/wifi/SoftApConfiguration$Builder;,sdk,system-api,test-api`
@@ -285,6 +286,7 @@ Greylisted/blacklisted APIs or internal constants: (some constants are hardcoded
 * (since API 31) `Landroid/net/wifi/SoftApConfiguration;->isBridgedModeOpportunisticShutdownEnabled()Z,sdk,system-api,test-api`
 * (since API 30) `Landroid/net/wifi/SoftApConfiguration;->isClientControlByUserEnabled()Z,sdk,system-api,test-api`
 * (since API 31) `Landroid/net/wifi/SoftApConfiguration;->isIeee80211axEnabled()Z,sdk,system-api,test-api`
+* (since API 33) `Landroid/net/wifi/SoftApConfiguration;->isIeee80211beEnabled()Z,sdk,system-api,test-api`
 * (since API 31) `Landroid/net/wifi/SoftApConfiguration;->isUserConfiguration()Z,sdk,system-api,test-api`
 * (since API 30) `Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_*:I,sdk,system-api,test-api`
 * (on API 30) `Landroid/net/wifi/SoftApInfo;->CHANNEL_WIDTH_INVALID:I,sdk,system-api,test-api`

mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt

@@ -50,6 +50,8 @@ data class SoftApConfigurationCompat(
         var isBridgedModeOpportunisticShutdownEnabled: Boolean = true,
         @TargetApi(31)
         var isIeee80211axEnabled: Boolean = true,
+        @TargetApi(33)
+        var isIeee80211beEnabled: Boolean = true,
         @TargetApi(31)
         var isUserConfiguration: Boolean = true,
         var underlying: Parcelable? = null) : Parcelable {
@@ -209,6 +211,10 @@ data class SoftApConfigurationCompat(
         private val isIeee80211axEnabled by lazy @TargetApi(31) {
             SoftApConfiguration::class.java.getDeclaredMethod("isIeee80211axEnabled")
         }
+        @get:RequiresApi(33)
+        private val isIeee80211beEnabled by lazy @TargetApi(33) {
+            SoftApConfiguration::class.java.getDeclaredMethod("isIeee80211beEnabled")
+        }
         @get:RequiresApi(31)
         private val isUserConfiguration by lazy @TargetApi(31) {
             SoftApConfiguration::class.java.getDeclaredMethod("isUserConfiguration")
@@ -262,6 +268,10 @@ data class SoftApConfigurationCompat(
         private val setIeee80211axEnabled by lazy @TargetApi(31) {
             classBuilder.getDeclaredMethod("setIeee80211axEnabled", Boolean::class.java)
         }
+        @get:RequiresApi(33)
+        private val setIeee80211beEnabled by lazy @TargetApi(33) {
+            classBuilder.getDeclaredMethod("setIeee80211beEnabled", Boolean::class.java)
+        }
         @get:RequiresApi(31)
         private val setMacRandomizationSetting by lazy @TargetApi(31) {
             classBuilder.getDeclaredMethod("setMacRandomizationSetting", Int::class.java)
@@ -343,6 +353,7 @@ data class SoftApConfigurationCompat(
             if (Build.VERSION.SDK_INT >= 31) getMacRandomizationSetting(this) as Int else RANDOMIZATION_PERSISTENT,
             Build.VERSION.SDK_INT < 31 || isBridgedModeOpportunisticShutdownEnabled(this) as Boolean,
             Build.VERSION.SDK_INT < 31 || isIeee80211axEnabled(this) as Boolean,
+            Build.VERSION.SDK_INT < 33 || isIeee80211beEnabled(this) as Boolean,
             Build.VERSION.SDK_INT < 31 || isUserConfiguration(this) as Boolean,
             this,
         )
@@ -461,6 +472,7 @@ 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) {

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

@@ -148,6 +148,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
             setMacRandomizationEnabled(dialogView.macRandomization.isChecked)
             isBridgedModeOpportunisticShutdownEnabled = dialogView.bridgedModeOpportunisticShutdown.isChecked
             isIeee80211axEnabled = dialogView.ieee80211ax.isChecked
+            isIeee80211beEnabled = dialogView.ieee80211be.isChecked
             isUserConfiguration = dialogView.userConfig.isChecked
         }
     }
@@ -225,6 +226,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
             dialogView.bridgedModeOpportunisticShutdown.isGone = true
             dialogView.userConfig.isGone = true
         }
+        if (arg.p2pMode || Build.VERSION.SDK_INT < 33) dialogView.ieee80211be.isGone = true
         base = arg.configuration
         populateFromConfiguration()
     }
@@ -263,6 +265,7 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
             base.macRandomizationSetting == SoftApConfigurationCompat.RANDOMIZATION_PERSISTENT
         dialogView.bridgedModeOpportunisticShutdown.isChecked = base.isBridgedModeOpportunisticShutdownEnabled
         dialogView.ieee80211ax.isChecked = base.isIeee80211axEnabled
+        dialogView.ieee80211be.isChecked = base.isIeee80211beEnabled
         dialogView.userConfig.isChecked = base.isUserConfiguration
     }
 

mobile/src/main/res/layout/dialog_wifi_ap.xml

@@ -285,6 +285,14 @@
                     android:layout_marginTop="8dip"
                     android:minHeight="@dimen/touch_target_min"
                     android:text="@string/wifi_ieee_80211ax" />
+                <com.google.android.material.materialswitch.MaterialSwitch
+                    android:id="@+id/ieee_80211be"
+                    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_ieee_80211be" />
                 <com.google.android.material.materialswitch.MaterialSwitch
                     android:id="@+id/bridged_mode_opportunistic_shutdown"
                     style="@style/wifi_item_label"

mobile/src/main/res/values-zh-rCN/strings.xml

@@ -194,6 +194,7 @@
     <string name="wifi_mac_randomization">随机生成 MAC 地址</string>
     <string name="wifi_bridged_mode_opportunistic_shutdown">启用桥接模式伺机关闭</string>
     <string name="wifi_ieee_80211ax">启用 Wi\u2011Fi 6</string>
+    <string name="wifi_ieee_80211be">启用 Wi\u2011Fi 7</string>
     <string name="wifi_user_config">用户提供配置</string>
     <string name="wifi_save" msgid="3331121567988522826">"保存"</string>
 

mobile/src/main/res/values-zh-rTW/strings.xml

@@ -203,6 +203,7 @@
     <string name="wifi_mac_randomization">隨機化 MAC 位址</string>
     <string name="wifi_bridged_mode_opportunistic_shutdown">啟用橋接模式隨機關閉</string>
     <string name="wifi_ieee_80211ax">啟用 Wi\u2011Fi 6</string>
+    <string name="wifi_ieee_80211be">啟用 Wi\u2011Fi 7</string>
     <string name="wifi_user_config">使用者提供組態</string>
     <string name="wifi_save" msgid="3331121567988522826">儲存</string>
 

mobile/src/main/res/values/strings.xml

@@ -218,6 +218,7 @@
     <string name="wifi_mac_randomization">Use randomized MAC</string>
     <string name="wifi_bridged_mode_opportunistic_shutdown">Enable Bridged mode opportunistic shutdown</string>
     <string name="wifi_ieee_80211ax">Enable Wi\u2011Fi 6</string>
+    <string name="wifi_ieee_80211be">Enable Wi\u2011Fi 7</string>
     <string name="wifi_user_config">User Supplied Configuration</string>
     <string name="wifi_save">Save</string>