Northern_Lights/NekoBoxForAndroid
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/NekoBoxForAndroid.git synced 2025-12-20 07:00:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
arm64v8a 2023-07-26 11:40:49 +09:00
parent 686a143b25
commit a58cf2e251
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/io/nekohasekai/sagernet/group/RawUpdater.kt
View File

@ -328,7 +328,7 @@ object RawUpdater : GroupUpdater() {
"tls" -> bean.security = "tls" -> bean.security =
if (opt.value.toString() == "true") "tls" else "" if (opt.value.toString() == "true") "tls" else ""
"servername" -> bean.host = opt.value.toString() "servername" -> bean.sni = opt.value.toString()
"skip-cert-verify" -> bean.allowInsecure = "skip-cert-verify" -> bean.allowInsecure =
opt.value.toString() == "true" opt.value.toString() == "true"
@ -409,9 +409,6 @@ object RawUpdater : GroupUpdater() {
} }
} }
} }
if (bean.isTLS() && bean.sni.isNullOrBlank() && !bean.host.isNullOrBlank()) {
bean.sni = bean.host
}
proxies.add(bean) proxies.add(bean)
} }
@ -578,8 +575,14 @@ object RawUpdater : GroupUpdater() {
proxies.forEach { proxies.forEach {
it.initializeDefaultValues() it.initializeDefaultValues()
if (it is StandardV2RayBean) { if (it is StandardV2RayBean) {
// 1. SNI
if (it.isTLS() && it.sni.isNullOrBlank() && !it.host.isNullOrBlank() && !it.host.isIpAddress()) {
it.sni = it.host
}
// 2. globalClientFingerprint
if (!it.realityPubKey.isNullOrBlank() && it.utlsFingerprint.isNullOrBlank()) { if (!it.realityPubKey.isNullOrBlank() && it.utlsFingerprint.isNullOrBlank()) {
it.utlsFingerprint = globalClientFingerprint it.utlsFingerprint = globalClientFingerprint
if (it.utlsFingerprint.isNullOrBlank()) it.utlsFingerprint = "chrome"
} }
} }
} }

4
app/src/main/java/io/nekohasekai/sagernet/plugin/PluginManager.kt
View File

@ -45,7 +45,7 @@ object PluginManager {
// internal so // internal so
if (info.applicationInfo == null) { if (info.applicationInfo == null) {
try { try {
initNativeInternal(pluginId)!!.let { return InitResult(it, info) } initNativeInternal(pluginId)?.let { return InitResult(it, info) }
} catch (t: Throwable) { } catch (t: Throwable) {
Logs.w("initNativeInternal failed", t) Logs.w("initNativeInternal failed", t)
} }
@ -53,7 +53,7 @@ object PluginManager {
} }
try { try {
initNativeFaster(info)!!.let { return InitResult(it, info) } initNativeFaster(info)?.let { return InitResult(it, info) }
} catch (t: Throwable) { } catch (t: Throwable) {
Logs.w("initNativeFaster failed", t) Logs.w("initNativeFaster failed", t)
} }