From ce9bed2e1f7a85856937ce7010297b017f234e14 Mon Sep 17 00:00:00 2001 From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com> Date: Fri, 29 Oct 2021 20:37:12 -0400 Subject: [PATCH] New config format --- V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt | 4 ++-- .../app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 51c7c71b..734cf876 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 @@ -20,7 +20,7 @@ data class V2rayConfig( val api: Any? = null, val transport: Any? = null, val reverse: Any? = null, - var fakedns: FakednsBean? = null, + var fakedns: Any? = null, val browserForwarder: Any? = null) { companion object { const val DEFAULT_PORT = 443 @@ -370,7 +370,7 @@ data class V2rayConfig( } data class DnsBean(var servers: ArrayList? = null, - var hosts: Map? = null, + var hosts: Map? = null, val clientIp: String? = null, val disableCache: Boolean? = null, val queryStrategy: String? = null, 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 689ec475..22b26cf0 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 @@ -128,7 +128,7 @@ object V2rayConfigUtil { private fun fakedns(v2rayConfig: V2rayConfig) { if (settingsStorage?.decodeBool(AppConfig.PREF_FAKE_DNS_ENABLED) == true) { - v2rayConfig.fakedns = V2rayConfig.FakednsBean() + v2rayConfig.fakedns = listOf(V2rayConfig.FakednsBean()) v2rayConfig.outbounds.filter { it.protocol == "freedom" }.forEach { it.settings?.domainStrategy = "UseIP" }