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

Fix this overriding again

Browse Source
This commit is contained in:
Mygod
2021-06-01 09:32:14 +08:00
parent a0b52f130f
commit b8df744c89
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/build.gradle.kts
View File

@@ -24,7 +24,7 @@ android {
minSdk = 21 minSdk = 21
if (targetSdk == 31) targetSdkPreview = "S" else this.targetSdk = targetSdk if (targetSdk == 31) targetSdkPreview = "S" else this.targetSdk = targetSdk
resourceConfigurations.addAll(arrayOf("it", "ru", "zh-rCN", "zh-rTW")) resourceConfigurations.addAll(arrayOf("it", "ru", "zh-rCN", "zh-rTW"))
versionCode = 270 versionCode = 271
versionName = "2.12.0" versionName = "2.12.0"
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
javaCompileOptions.annotationProcessorOptions.arguments.apply { javaCompileOptions.annotationProcessorOptions.arguments.apply {

6
mobile/src/main/AndroidManifest.xml
View File

@@ -9,9 +9,6 @@
<uses-feature <uses-feature
android:name="android.hardware.ethernet" android:name="android.hardware.ethernet"
android:required="false"/> android:required="false"/>
<uses-feature
android:name="android.software.leanback"
android:required="false"/>
<uses-feature <uses-feature
android:name="android.hardware.touchscreen" android:name="android.hardware.touchscreen"
android:required="false"/> android:required="false"/>
@@ -24,6 +21,9 @@
<uses-feature <uses-feature
android:name="android.hardware.wifi.direct" android:name="android.hardware.wifi.direct"
android:required="false"/> android:required="false"/>
<uses-feature
android:name="android.software.leanback"
android:required="false"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>

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

@@ -318,8 +318,8 @@ data class SoftApConfigurationCompat(
bssid?.toCompat()?.addr, bssid?.toCompat()?.addr,
passphrase, passphrase,
isHiddenSsid, isHiddenSsid,
if (BuildCompat.isAtLeastS()) getChannels(this) as SparseIntArray else SparseIntArray(1).apply { if (BuildCompat.isAtLeastS()) getChannels(this) as SparseIntArray else SparseIntArray(1).also {
append(getBand(this) as Int, getChannel(this) as Int) it.append(getBand(this) as Int, getChannel(this) as Int)
}, },
securityType, securityType,
getMaxNumberOfClients(this) as Int, getMaxNumberOfClients(this) as Int,