SagerNet/sing-box-for-android
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box-for-android.git synced 2025-04-04 12:27:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix compatibility with Android 14

Browse source
This commit is contained in:
iKirby 2023-08-02 10:46:50 +08:00 • committed by GitHub
parent 58bd31d6b7
commit 3ccf4d6def
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/build.gradle
View file

@ -9,7 +9,7 @@ plugins {
android { android {
namespace 'io.nekohasekai.sfa' namespace 'io.nekohasekai.sfa'
compileSdk 33 compileSdk 34
ksp { ksp {
arg("room.incremental", "true") arg("room.incremental", "true")
@ -60,13 +60,14 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8 sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
buildFeatures { buildFeatures {
viewBinding true viewBinding true
aidl true aidl true
} }
applicationVariants.all { variant -> applicationVariants.configureEach { variant ->
variant.outputs.all { variant.outputs.configureEach {
outputFileName = (outputFileName as String).replace("-release", "") outputFileName = (outputFileName as String).replace("-release", "")
} }
} }
@ -102,13 +103,7 @@ dependencies {
implementation('org.smali:dexlib2:2.5.2') { implementation('org.smali:dexlib2:2.5.2') {
exclude group: 'com.google.guava', module: 'guava' exclude group: 'com.google.guava', module: 'guava'
} }
implementation('com.google.guava:guava:32.1.1-android') implementation('com.google.guava:guava:32.1.2-android')
// ref: https://github.com/google/guava/releases/tag/v32.1.0#user-content-duplicate-ListenableFuture
modules {
module("com.google.guava:listenablefuture") {
replacedBy("com.google.guava:guava", "listenablefuture is part of guava")
}
}
} }
if (getProps("APPCENTER_TOKEN") != "") { if (getProps("APPCENTER_TOKEN") != "") {
@ -140,10 +135,10 @@ def getProps(String propName) {
props.load(new FileInputStream(propsFile)) props.load(new FileInputStream(propsFile))
String value = props[propName] String value = props[propName]
if (value == null) { if (value == null) {
return ""; return ""
} }
return value return value
} else { } else {
return ""; return ""
} }
} }

12
app/src/main/AndroidManifest.xml
View file

@ -4,6 +4,7 @@
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
@ -120,14 +121,23 @@
<service <service
android:name=".bg.VPNService" android:name=".bg.VPNService"
android:exported="false" android:exported="false"
android:foregroundServiceType="specialUse"
android:permission="android.permission.BIND_VPN_SERVICE"> android:permission="android.permission.BIND_VPN_SERVICE">
<intent-filter> <intent-filter>
<action android:name="android.net.VpnService" /> <action android:name="android.net.VpnService" />
</intent-filter> </intent-filter>
<property
android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
android:value="vpn" />
</service> </service>
<service <service
android:name=".bg.ProxyService" android:name=".bg.ProxyService"
android:exported="false" /> android:exported="false"
android:foregroundServiceType="specialUse">
<property
android:name="android.app.PROPERTY_SPECIAL_USE_FGS_SUBTYPE"
android:value="proxy" />
</service>
<receiver <receiver
android:name=".bg.BootReceiver" android:name=".bg.BootReceiver"

4
app/src/main/java/io/nekohasekai/sfa/bg/BoxService.kt
View file

@ -235,10 +235,10 @@ class BoxService(
status.value = Status.Starting status.value = Status.Starting
if (!receiverRegistered) { if (!receiverRegistered) {
service.registerReceiver(receiver, IntentFilter().apply { ContextCompat.registerReceiver(service, receiver, IntentFilter().apply {
addAction(Action.SERVICE_CLOSE) addAction(Action.SERVICE_CLOSE)
addAction(Action.SERVICE_RELOAD) addAction(Action.SERVICE_RELOAD)
}) }, ContextCompat.RECEIVER_NOT_EXPORTED)
receiverRegistered = true receiverRegistered = true
} }