mirror of
https://github.com/EasyTier/EasyTier.git
synced 2025-10-06 17:26:56 +08:00
fix crash on old version android (<= 9) (#183)
* fix crash on old version android (<= 9) * fix listener select
This commit is contained in:
@@ -102,6 +102,10 @@ const searchListenerSuggestiong = (e: { query: string }) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ret.length === 0) {
|
||||||
|
ret.push(e.query)
|
||||||
|
}
|
||||||
|
|
||||||
listenerSuggestions.value = ret
|
listenerSuggestions.value = ret
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -2,7 +2,6 @@ package com.plugin.vpnservice
|
|||||||
|
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
import android.net.VpnService
|
import android.net.VpnService
|
||||||
import android.net.IpPrefix
|
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
import android.os.ParcelFileDescriptor
|
import android.os.ParcelFileDescriptor
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
@@ -11,16 +10,6 @@ import java.util.Arrays
|
|||||||
|
|
||||||
import app.tauri.plugin.JSObject
|
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() {
|
class TauriVpnService : VpnService() {
|
||||||
companion object {
|
companion object {
|
||||||
@JvmField var triggerCallback: (String, JSObject) -> Unit = { _, _ -> }
|
@JvmField var triggerCallback: (String, JSObject) -> Unit = { _, _ -> }
|
||||||
@@ -99,7 +88,9 @@ class TauriVpnService : VpnService() {
|
|||||||
builder.addDnsServer(dns)
|
builder.addDnsServer(dns)
|
||||||
|
|
||||||
for (route in routes) {
|
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) {
|
for (app in disallowedApplications) {
|
||||||
|
Reference in New Issue
Block a user