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

Fix todos

Browse Source
This commit is contained in:
Mygod
2020-09-11 08:06:47 +08:00
parent 37724b6412
commit cc5bf38ecb
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,6 @@ data class SoftApConfigurationCompat(
*/ */
private const val LEGACY_WPA2_PSK = 4 private const val LEGACY_WPA2_PSK = 4
// TODO: localize?
val securityTypes = arrayOf("OPEN", "WPA2-PSK", "WPA3-SAE", "WPA3-SAE Transition mode") val securityTypes = arrayOf("OPEN", "WPA2-PSK", "WPA3-SAE", "WPA3-SAE Transition mode")
private val qrSanitizer = Regex("([\\\\\":;,])") private val qrSanitizer = Regex("([\\\\\":;,])")
@@ -55,7 +54,7 @@ data class SoftApConfigurationCompat(
/** /**
* Based on: * Based on:
* https://elixir.bootlin.com/linux/v5.7.6/source/net/wireless/util.c#L75 * https://elixir.bootlin.com/linux/v5.7.6/source/net/wireless/util.c#L75
* TODO [com.android.server.wifi.util.ApConfigUtil] * https://cs.android.com/android/platform/superproject/+/master:frameworks/base/wifi/java/android/net/wifi/ScanResult.java;l=624;drc=f7ccda05642b55700d67a288462bada488fc7f5e
*/ */
fun channelToFrequency(band: Int, chan: Int) = when (band) { fun channelToFrequency(band: Int, chan: Int) = when (band) {
BAND_2GHZ -> when (chan) { BAND_2GHZ -> when (chan) {
@@ -196,7 +195,7 @@ data class SoftApConfigurationCompat(
BSSID?.let { MacAddressCompat.fromString(it) }?.addr, BSSID?.let { MacAddressCompat.fromString(it) }?.addr,
preSharedKey, preSharedKey,
hiddenSSID, hiddenSSID,
// TODO [android.net.wifi.SoftApConfToXmlMigrationUtil.convertWifiConfigBandToSoftApConfigBand] // https://cs.android.com/android/platform/superproject/+/master:frameworks/base/wifi/java/android/net/wifi/SoftApConfToXmlMigrationUtil.java;l=87;drc=aa6527cf41671d1ed417b8ebdb6b3aa614f62344
if (Build.VERSION.SDK_INT >= 23) when (val band = apBand.getInt(this)) { if (Build.VERSION.SDK_INT >= 23) when (val band = apBand.getInt(this)) {
0 -> BAND_2GHZ 0 -> BAND_2GHZ
1 -> BAND_5GHZ 1 -> BAND_5GHZ
@@ -258,7 +257,7 @@ data class SoftApConfigurationCompat(
* Based on: * Based on:
* https://android.googlesource.com/platform/packages/apps/Settings/+/android-5.0.0_r1/src/com/android/settings/wifi/WifiApDialog.java#88 * https://android.googlesource.com/platform/packages/apps/Settings/+/android-5.0.0_r1/src/com/android/settings/wifi/WifiApDialog.java#88
* https://android.googlesource.com/platform/packages/apps/Settings/+/b1af85d/src/com/android/settings/wifi/tether/WifiTetherSettings.java#162 * https://android.googlesource.com/platform/packages/apps/Settings/+/b1af85d/src/com/android/settings/wifi/tether/WifiTetherSettings.java#162
* TODO [SoftApConfiguration.toWifiConfiguration] * https://android.googlesource.com/platform/frameworks/base/+/92c8f59/wifi/java/android/net/wifi/SoftApConfiguration.java#511
*/ */
@SuppressLint("NewApi") // https://android.googlesource.com/platform/frameworks/base/+/android-5.0.0_r1/wifi/java/android/net/wifi/WifiConfiguration.java#1385 @SuppressLint("NewApi") // https://android.googlesource.com/platform/frameworks/base/+/android-5.0.0_r1/wifi/java/android/net/wifi/WifiConfiguration.java#1385
@Deprecated("Class deprecated in framework, use toPlatform().toWifiConfiguration()") @Deprecated("Class deprecated in framework, use toPlatform().toWifiConfiguration()")

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

@@ -237,9 +237,11 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
val selectedSecurity = if (arg.p2pMode) { val selectedSecurity = if (arg.p2pMode) {
SoftApConfiguration.SECURITY_TYPE_WPA2_PSK SoftApConfiguration.SECURITY_TYPE_WPA2_PSK
} else dialogView.security.selectedItemPosition } else dialogView.security.selectedItemPosition
// see also: https://android.googlesource.com/platform/frameworks/base/+/92c8f59/wifi/java/android/net/wifi/SoftApConfiguration.java#688
val passwordValid = when (selectedSecurity) { val passwordValid = when (selectedSecurity) {
// TODO SoftApConfiguration.SECURITY_TYPE_WPA2_PSK, SoftApConfiguration.SECURITY_TYPE_WPA3_SAE_TRANSITION -> {
SoftApConfiguration.SECURITY_TYPE_WPA2_PSK -> dialogView.password.length() >= 8 dialogView.password.length() >= 8
}
else -> true // do not try to validate else -> true // do not try to validate
} }
dialogView.passwordWrapper.error = if (passwordValid) null else " " dialogView.passwordWrapper.error = if (passwordValid) null else " "

4
mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApManager.kt
View File

@@ -23,12 +23,12 @@ import java.util.concurrent.Executor
object WifiApManager { object WifiApManager {
/** /**
* TODO [com.android.server.wifi.WifiContext.ACTION_RESOURCES_APK] * https://android.googlesource.com/platform/frameworks/opt/net/wifi/+/000ad45/service/java/com/android/server/wifi/WifiContext.java#41
*/ */
@RequiresApi(30) @RequiresApi(30)
private const val ACTION_RESOURCES_APK = "com.android.server.wifi.intent.action.SERVICE_WIFI_RESOURCES_APK" private const val ACTION_RESOURCES_APK = "com.android.server.wifi.intent.action.SERVICE_WIFI_RESOURCES_APK"
/** /**
* Based on: TODO [com.android.server.wifi.WifiContext.getWifiOverlayApkPkgName] * Based on: https://android.googlesource.com/platform/frameworks/opt/net/wifi/+/000ad45/service/java/com/android/server/wifi/WifiContext.java#66
*/ */
@get:RequiresApi(30) @get:RequiresApi(30)
val resolvedActivity get() = app.packageManager.queryIntentActivities(Intent(ACTION_RESOURCES_APK), val resolvedActivity get() = app.packageManager.queryIntentActivities(Intent(ACTION_RESOURCES_APK),