jahlib/v2rayNG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into new-storage

Browse Source
This commit is contained in:
yuhan6665
2021-03-26 20:55:00 -04:00
parent 463f45804f
commit 00e6314afe
5 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt
+2 -2
View File
@@ -9,9 +9,9 @@ import com.google.gson.reflect.TypeToken
import java.lang.reflect.Type
data class V2rayConfig(
val stats: Any? = null,
var stats: Any? = null,
val log: LogBean,
val policy: PolicyBean,
var policy: PolicyBean?,
val inbounds: ArrayList<InboundBean>,
var outbounds: ArrayList<OutboundBean>,
var dns: DnsBean,
V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/VmessQRCode.kt
+2 -1
View File
@@ -10,4 +10,5 @@ data class VmessQRCode(var v: String = "",
var type: String = "",
var host: String = "",
var path: String = "",
var tls: String = "")
var tls: String = "",
var sni: String = "")
V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt
-3
View File
@@ -257,9 +257,6 @@ class ServerActivity : BaseActivity() {
requestHost,
path
)
if (sni.isEmpty()) {
sni = requestHost
}
val allowInsecure = if (sp_allow_insecure == null || allowinsecures[sp_allow_insecure.selectedItemPosition].isBlank()) {
false//settingsStorage?.decodeBool(PREF_ALLOW_INSECURE) ?: false
} else {
V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt
+9 -2
View File
@@ -110,7 +110,8 @@ object AngConfigManager {
}
val sni = streamSetting.populateTransportSettings(vmessQRCode.net, vmessQRCode.type, vmessQRCode.host,
vmessQRCode.path, vmessQRCode.path, vmessQRCode.host, vmessQRCode.path)
streamSetting.populateTlsSettings(vmessQRCode.tls, allowInsecure, sni)
streamSetting.populateTlsSettings(vmessQRCode.tls, allowInsecure,
if (vmessQRCode.sni.isNotBlank()) vmessQRCode.sni else sni)
}
}
} else if (str.startsWith(EConfigType.SHADOWSOCKS.protocolScheme)) {
@@ -212,7 +213,7 @@ object AngConfigManager {
val sni = streamSetting.populateTransportSettings(queryParam["type"] ?: "tcp", queryParam["headerType"],
queryParam["host"], queryParam["path"], queryParam["seed"], queryParam["quicSecurity"], queryParam["key"])
streamSetting.populateTlsSettings(queryParam["security"] ?: "", allowInsecure, sni)
streamSetting.populateTlsSettings(queryParam["security"] ?: "", allowInsecure, queryParam["sni"] ?: sni)
}
if (config == null){
return R.string.toast_incorrect_protocol
@@ -312,6 +313,7 @@ object AngConfigManager {
vmessQRCode.aid = outbound.settings?.vnext?.get(0)?.users?.get(0)?.alterId.toString()
vmessQRCode.net = streamSetting.network
vmessQRCode.tls = streamSetting.security
vmessQRCode.sni = streamSetting.tlsSettings?.serverName.orEmpty()
outbound.getTransportSettingDetails()?.let { transportDetails ->
vmessQRCode.type = transportDetails[0]
vmessQRCode.host = transportDetails[1]
@@ -352,6 +354,11 @@ object AngConfigManager {
else outbound.getSecurityEncryption().orEmpty()
dicQuery["security"] = if (streamSetting.security.isEmpty()) "none"
else streamSetting.security
(streamSetting.tlsSettings?: streamSetting.xtlsSettings)?.let { tlsSetting ->
if (!TextUtils.isEmpty(tlsSetting.serverName)) {
dicQuery["sni"] = tlsSetting.serverName
}
}
dicQuery["type"] = if (streamSetting.network.isEmpty()) V2rayConfig.DEFAULT_NETWORK
else streamSetting.network
V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt
+4
View File
@@ -71,6 +71,10 @@ object V2rayConfigUtil {
} else {
customRemoteDns(v2rayConfig, context)
}
if (settingsStorage?.decodeBool(AppConfig.PREF_SPEED_ENABLED) != true) {
v2rayConfig.stats = null
v2rayConfig.policy = null
}
result.status = true
result.content = v2rayConfig.toPrettyPrinting()
return result