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

update

Browse Source
This commit is contained in:
arm64v8a 2023-10-15 13:10:17 +09:00
parent 7b16d9e202
commit f5e7dd592e
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/io/nekohasekai/sagernet/database/ProxyEntity.kt
View File

@ -173,7 +173,7 @@ data class ProxyEntity(
} }
} }
fun displayType() = when (type) { fun displayType(): String = when (type) {
TYPE_SOCKS -> socksBean!!.protocolName() TYPE_SOCKS -> socksBean!!.protocolName()
TYPE_HTTP -> if (httpBean!!.isTLS()) "HTTPS" else "HTTP" TYPE_HTTP -> if (httpBean!!.isTLS()) "HTTPS" else "HTTP"
TYPE_SS -> "Shadowsocks" TYPE_SS -> "Shadowsocks"
@ -181,7 +181,7 @@ data class ProxyEntity(
TYPE_TROJAN -> "Trojan" TYPE_TROJAN -> "Trojan"
TYPE_TROJAN_GO -> "Trojan-Go" TYPE_TROJAN_GO -> "Trojan-Go"
TYPE_NAIVE -> "Naïve" TYPE_NAIVE -> "Naïve"
TYPE_HYSTERIA -> "Hysteria" TYPE_HYSTERIA -> "Hysteria" + hysteriaBean!!.protocolVersion
TYPE_SSH -> "SSH" TYPE_SSH -> "SSH"
TYPE_WG -> "WireGuard" TYPE_WG -> "WireGuard"
TYPE_TUIC -> "TUIC" TYPE_TUIC -> "TUIC"

14
app/src/main/java/io/nekohasekai/sagernet/fmt/v2ray/V2RayFmt.kt
View File

@ -583,18 +583,20 @@ fun buildSingBoxOutboundTLS(bean: StandardV2RayBean): OutboundTLSOptions? {
if (bean.sni.isNotBlank()) server_name = bean.sni if (bean.sni.isNotBlank()) server_name = bean.sni
if (bean.alpn.isNotBlank()) alpn = bean.alpn.listByLineOrComma() if (bean.alpn.isNotBlank()) alpn = bean.alpn.listByLineOrComma()
if (bean.certificates.isNotBlank()) certificate = bean.certificates if (bean.certificates.isNotBlank()) certificate = bean.certificates
if (bean.utlsFingerprint.isNotBlank()) { var fp = bean.utlsFingerprint
utls = OutboundUTLSOptions().apply {
enabled = true
fingerprint = bean.utlsFingerprint
}
}
if (bean.realityPubKey.isNotBlank()) { if (bean.realityPubKey.isNotBlank()) {
reality = OutboundRealityOptions().apply { reality = OutboundRealityOptions().apply {
enabled = true enabled = true
public_key = bean.realityPubKey public_key = bean.realityPubKey
short_id = bean.realityShortId short_id = bean.realityShortId
} }
if (fp.isNullOrBlank()) fp = "chrome"
}
if (fp.isNotBlank()) {
utls = OutboundUTLSOptions().apply {
enabled = true
fingerprint = fp
}
} }
} }
} }

3
app/src/main/java/io/nekohasekai/sagernet/ktx/Nets.kt
View File

@ -2,6 +2,7 @@
package io.nekohasekai.sagernet.ktx package io.nekohasekai.sagernet.ktx
import io.nekohasekai.sagernet.BuildConfig
import io.nekohasekai.sagernet.fmt.AbstractBean import io.nekohasekai.sagernet.fmt.AbstractBean
import moe.matsuri.nb4a.utils.NGUtil import moe.matsuri.nb4a.utils.NGUtil
import okhttp3.HttpUrl import okhttp3.HttpUrl
@ -62,4 +63,4 @@ fun mkPort(): Int {
return port return port
} }
const val USER_AGENT = "NekoBox/Android/1.0 (Prefer ClashMeta Format)" const val USER_AGENT = "NekoBox/Android/" + BuildConfig.VERSION_NAME + " (Prefer ClashMeta Format)"