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 730474ea..a9b581f3 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 @@ -456,7 +456,7 @@ data class V2rayConfig( var rules: ArrayList, val balancers: List? = null) { - data class RulesBean(var type: String = "", + data class RulesBean( var ip: ArrayList? = null, var domain: ArrayList? = null, var outboundTag: String = "", @@ -489,8 +489,8 @@ data class V2rayConfig( var poolSize: Int = 10000) // roughly 10 times smaller than total ip pool fun getProxyOutbound(): OutboundBean? { - outbounds?.forEach { outbound -> - EConfigType.values().forEach { + outbounds.forEach { outbound -> + EConfigType.entries.forEach { if (outbound.protocol.equals(it.name, true)) { return outbound } diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt index b3ec9c4d..2c4911c2 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt @@ -195,7 +195,6 @@ object V2rayConfigUtil { // Hardcode googleapis.cn val googleapisRoute = V2rayConfig.RoutingBean.RulesBean( - type = "field", outboundTag = AppConfig.TAG_AGENT, domain = arrayListOf("domain:googleapis.cn") ) @@ -220,7 +219,6 @@ object V2rayConfigUtil { ERoutingMode.GLOBAL_DIRECT.value -> { val globalDirect = V2rayConfig.RoutingBean.RulesBean( - type = "field", outboundTag = AppConfig.TAG_DIRECT, port = "0-65535" ) @@ -245,7 +243,6 @@ object V2rayConfigUtil { //IP if (ipOrDomain == "ip" || ipOrDomain == "") { val rulesIP = V2rayConfig.RoutingBean.RulesBean() - rulesIP.type = "field" rulesIP.outboundTag = tag rulesIP.ip = ArrayList() rulesIP.ip?.add("geoip:$code") @@ -255,7 +252,6 @@ object V2rayConfigUtil { if (ipOrDomain == "domain" || ipOrDomain == "") { //Domain val rulesDomain = V2rayConfig.RoutingBean.RulesBean() - rulesDomain.type = "field" rulesDomain.outboundTag = tag rulesDomain.domain = ArrayList() rulesDomain.domain?.add("geosite:$code") @@ -272,13 +268,11 @@ object V2rayConfigUtil { if (!TextUtils.isEmpty(userRule)) { //Domain val rulesDomain = V2rayConfig.RoutingBean.RulesBean() - rulesDomain.type = "field" rulesDomain.outboundTag = tag rulesDomain.domain = ArrayList() //IP val rulesIP = V2rayConfig.RoutingBean.RulesBean() - rulesIP.type = "field" rulesIP.outboundTag = tag rulesIP.ip = ArrayList() @@ -383,7 +377,6 @@ object V2rayConfigUtil { // DNS routing tag v2rayConfig.routing.rules.add( 0, V2rayConfig.RoutingBean.RulesBean( - type = "field", inboundTag = arrayListOf("dns-in"), outboundTag = "dns-out", domain = null @@ -454,7 +447,6 @@ object V2rayConfigUtil { if (Utils.isPureIpAddress(domesticDns.first())) { v2rayConfig.routing.rules.add( 0, V2rayConfig.RoutingBean.RulesBean( - type = "field", outboundTag = AppConfig.TAG_DIRECT, port = "53", ip = arrayListOf(domesticDns.first()), @@ -485,7 +477,6 @@ object V2rayConfigUtil { if (Utils.isPureIpAddress(remoteDns.first())) { v2rayConfig.routing.rules.add( 0, V2rayConfig.RoutingBean.RulesBean( - type = "field", outboundTag = AppConfig.TAG_AGENT, port = "53", ip = arrayListOf(remoteDns.first()),