apps/EasyTier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2025-10-08 02:01:21 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix crash on old version android (<= 9) (#183)

Browse Source 
* fix crash on old version android (<= 9)
* fix listener select
This commit is contained in:
Sijie.Sun
2024-07-19 23:55:11 +08:00
committed by GitHub
parent 8858492fb4
commit fc9812dd54
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
easytier-gui/src/components/Config.vue
View File

@@ -102,6 +102,10 @@ const searchListenerSuggestiong = (e: { query: string }) => {
}
}
if (ret.length === 0) {
ret.push(e.query)
}
listenerSuggestions.value = ret
}

15
tauri-plugin-vpnservice/android/src/main/java/TauriVpnService.kt
View File

@@ -2,7 +2,6 @@ package com.plugin.vpnservice
import android.content.Intent
import android.net.VpnService
import android.net.IpPrefix
import android.os.Build
import android.os.ParcelFileDescriptor
import android.os.Bundle
@@ -11,16 +10,6 @@ import java.util.Arrays
import app.tauri.plugin.JSObject
fun stringToIpPrefix(ipPrefixString: String): IpPrefix {
val parts = ipPrefixString.split("/")
if (parts.size != 2) throw IllegalArgumentException("Invalid IP prefix string")
val address = InetAddress.getByName(parts[0])
val prefixLength = parts[1].toInt()
return IpPrefix(address, prefixLength)
}
class TauriVpnService : VpnService() {
companion object {
@JvmField var triggerCallback: (String, JSObject) -> Unit = { _, _ -> }
@@ -99,7 +88,9 @@ class TauriVpnService : VpnService() {
builder.addDnsServer(dns)
for (route in routes) {
builder.addRoute(stringToIpPrefix(route))
val ipParts = ipv4Addr.split("/")
if (ipParts.size != 2) throw IllegalArgumentException("Invalid IP addr string")
builder.addAddress(ipParts[0], ipParts[1].toInt())
}
for (app in disallowedApplications) {