diff --git a/V2rayNG/app/src/main/assets/v2ray_config.json b/V2rayNG/app/src/main/assets/v2ray_config.json index 2783ec74..5e009dc8 100644 --- a/V2rayNG/app/src/main/assets/v2ray_config.json +++ b/V2rayNG/app/src/main/assets/v2ray_config.json @@ -54,7 +54,6 @@ "users": [ { "id": "a3482e88-686a-4a58-8126-99c9df64b7bf", - "alterId": 64, "security": "auto", "level": 8 } diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt index 734cf876..e3bc1e22 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt @@ -89,7 +89,6 @@ data class V2rayConfig( var users: List) { data class UsersBean(var id: String = "", - var alterId: Int? = null, var security: String = DEFAULT_SECURITY, var level: Int = DEFAULT_LEVEL, var encryption: String = "", diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/VmessQRCode.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/VmessQRCode.kt index d8363ca5..a114336c 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/VmessQRCode.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/VmessQRCode.kt @@ -5,7 +5,7 @@ data class VmessQRCode(var v: String = "", var add: String = "", var port: String = "", var id: String = "", - var aid: String = "", + var aid: String = "0", var net: String = "", var type: String = "", var host: String = "", diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt index f8a279dc..17fd859a 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt @@ -128,7 +128,6 @@ class ServerActivity : BaseActivity() { et_address.text = Utils.getEditable(outbound.getServerAddress().orEmpty()) et_port.text = Utils.getEditable(outbound.getServerPort()?.toString() ?: DEFAULT_PORT.toString()) et_id.text = Utils.getEditable(outbound.getPassword().orEmpty()) - et_alterId?.text = Utils.getEditable(outbound.settings?.vnext?.get(0)?.users?.get(0)?.alterId.toString()) if (config.configType == EConfigType.SOCKS) { et_security.text = Utils.getEditable(outbound.settings?.servers?.get(0)?.users?.get(0)?.user.orEmpty()) } else if (config.configType == EConfigType.VLESS) { @@ -170,7 +169,6 @@ class ServerActivity : BaseActivity() { et_address.text = null et_port.text = Utils.getEditable(DEFAULT_PORT.toString()) et_id.text = null - et_alterId?.text = Utils.getEditable("0") sp_security?.setSelection(0) sp_network?.setSelection(0) @@ -207,13 +205,6 @@ class ServerActivity : BaseActivity() { toast(R.string.server_lab_id) return false } - et_alterId?.let { - val alterId = Utils.parseInt(et_alterId.text.toString()) - if (alterId < 0) { - toast(R.string.server_lab_alterid) - return false - } - } config.remarks = et_remarks.text.toString().trim() config.outboundBean?.settings?.vnext?.get(0)?.let { vnext -> @@ -237,7 +228,6 @@ class ServerActivity : BaseActivity() { vnext.port = port vnext.users[0].id = et_id.text.toString().trim() if (config.configType == EConfigType.VMESS) { - vnext.users[0].alterId = Utils.parseInt(et_alterId.text.toString()) vnext.users[0].security = securitys[sp_security.selectedItemPosition] } else if (config.configType == EConfigType.VLESS) { vnext.users[0].encryption = et_security.text.toString().trim() diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt index 21c95a7e..74844498 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/AngConfigManager.kt @@ -102,7 +102,6 @@ object AngConfigManager { vnext.port = vmessBean.port vnext.users[0].id = vmessBean.id if (config.configType == EConfigType.VMESS) { - vnext.users[0].alterId = vmessBean.alterId vnext.users[0].security = vmessBean.security } else if (config.configType == EConfigType.VLESS) { vnext.users[0].encryption = vmessBean.security @@ -195,7 +194,6 @@ object AngConfigManager { if (TextUtils.isEmpty(vmessQRCode.add) || TextUtils.isEmpty(vmessQRCode.port) || TextUtils.isEmpty(vmessQRCode.id) - || TextUtils.isEmpty(vmessQRCode.aid) || TextUtils.isEmpty(vmessQRCode.net) ) { return R.string.toast_incorrect_protocol @@ -207,7 +205,6 @@ object AngConfigManager { vnext.port = Utils.parseInt(vmessQRCode.port) vnext.users[0].id = vmessQRCode.id vnext.users[0].encryption = DEFAULT_SECURITY - vnext.users[0].alterId = Utils.parseInt(vmessQRCode.aid) } val sni = streamSetting.populateTransportSettings(vmessQRCode.net, vmessQRCode.type, vmessQRCode.host, vmessQRCode.path, vmessQRCode.path, vmessQRCode.host, vmessQRCode.path, vmessQRCode.type, vmessQRCode.path) @@ -336,8 +333,8 @@ object AngConfigManager { return runCatching { val uri = URI(uriString) check(uri.scheme == "vmess") - val (_, protocol, tlsStr, uuid, alterId) = - Regex("(tcp|http|ws|kcp|quic|grpc)(\\+tls)?:([0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12})-([0-9]+)") + val (_, protocol, tlsStr, uuid) = + Regex("(tcp|http|ws|kcp|quic|grpc)(\\+tls)?:([0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12})") .matchEntire(uri.userInfo)?.groupValues ?: error("parse user info fail.") val tls = tlsStr.isNotBlank() @@ -351,7 +348,6 @@ object AngConfigManager { vnext.port = uri.port vnext.users[0].id = uuid vnext.users[0].encryption = DEFAULT_SECURITY - vnext.users[0].alterId = alterId.toInt() } val sni = streamSetting.populateTransportSettings(protocol, queryParam["type"], @@ -388,7 +384,6 @@ object AngConfigManager { vnext.port = Utils.parseInt(arr22[1]) vnext.users[0].id = arr21[1] vnext.users[0].encryption = arr21[0] - vnext.users[0].alterId = 0 } return true } @@ -409,7 +404,6 @@ object AngConfigManager { vmessQRCode.add = outbound.getServerAddress().orEmpty() vmessQRCode.port = outbound.getServerPort().toString() vmessQRCode.id = outbound.getPassword().orEmpty() - 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() diff --git a/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml b/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml index 69fb9b58..ff11d9f0 100644 --- a/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml +++ b/V2rayNG/app/src/main/res/layout/activity_server_vmess.xml @@ -98,26 +98,6 @@ - - - - - - - - 地址(address) 端口(port) 用户ID(id) - 额外ID(alterId) 加密方式(security) 传输协议(network) 功能设置(不清楚则保持默认值) diff --git a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml index dd6ac711..1500092a 100644 --- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml @@ -38,7 +38,6 @@ 位址 埠 使用者識別碼 - AlterId 安全性 網路 更多功能 diff --git a/V2rayNG/app/src/main/res/values/strings.xml b/V2rayNG/app/src/main/res/values/strings.xml index 334aecae..171a069a 100644 --- a/V2rayNG/app/src/main/res/values/strings.xml +++ b/V2rayNG/app/src/main/res/values/strings.xml @@ -38,7 +38,6 @@ address port id - alterId security Network more function