vodorod/umbrix
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 1 Wiki Activity

fix: loop in android

Browse Source
This commit is contained in:
hiddify-com
2024-07-31 21:40:14 +02:00
parent 52fa311df5
commit 36e2bca843
1 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
android/app/src/main/kotlin/com/hiddify/hiddify/bg/VPNService.kt
View File

@@ -129,11 +129,13 @@ class VPNService : VpnService(), PlatformInterfaceWrapper {
if (Settings.perAppProxyMode == PerAppProxyMode.INCLUDE) { if (Settings.perAppProxyMode == PerAppProxyMode.INCLUDE) {
appList.forEach { appList.forEach {
try { try {
builder.addAllowedApplication(it) if (it != packageName)
builder.addAllowedApplication(it)
} catch (_: NameNotFoundException) { } catch (_: NameNotFoundException) {
} }
} }
builder.addAllowedApplication(packageName)
} else { } else {
appList.forEach { appList.forEach {
try { try {
@@ -141,26 +143,38 @@ class VPNService : VpnService(), PlatformInterfaceWrapper {
} catch (_: NameNotFoundException) { } catch (_: NameNotFoundException) {
} }
} }
try {
builder.addDisallowedApplication(packageName)
} catch (_: NameNotFoundException) {
}
} }
} else { } else {
val includePackage = options.includePackage val includePackage = options.includePackage
if (includePackage.hasNext()) { if (includePackage.hasNext()) {
while (includePackage.hasNext()) { while (includePackage.hasNext()) {
try { try {
builder.addAllowedApplication(includePackage.next()) val it = includePackage.next()
if (it != packageName)
builder.addAllowedApplication(it)
} catch (_: NameNotFoundException) { } catch (_: NameNotFoundException) {
} }
} }
} } else {
val excludePackage = options.excludePackage val excludePackage = options.excludePackage
if (excludePackage.hasNext()) { if (excludePackage.hasNext()) {
while (excludePackage.hasNext()) { while (excludePackage.hasNext()) {
try { try {
builder.addDisallowedApplication(excludePackage.next()) builder.addDisallowedApplication(excludePackage.next())
} catch (_: NameNotFoundException) { } catch (_: NameNotFoundException) {
}
} }
} }
try {
builder.addDisallowedApplication(packageName)
} catch (_: NameNotFoundException) {
}
} }
} }
} }