diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/core/CoreOutboundBuilder.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/core/CoreOutboundBuilder.kt index 54ccfb58e..fb135e57b 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/core/CoreOutboundBuilder.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/core/CoreOutboundBuilder.kt @@ -259,9 +259,7 @@ object CoreOutboundBuilder { ?.ifEmpty { null } ?: listOf(AppConfig.WIREGUARD_LOCAL_REMOTE_DNS) - val remotes = if (rawDNS.size == 1 && rawDNS[0] == "local") { - rawDNS - } else if (MmkvManager.decodeSettingsBool(AppConfig.PREF_IPV6_ENABLED) == true) { + val remotes = if (MmkvManager.decodeSettingsBool(AppConfig.PREF_IPV6_ENABLED) == true) { rawDNS } else { val ipv4Dns = rawDNS.filter { !it.contains(":") } diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt index 6e87fb268..e3f49d8a5 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/dto/V2rayConfig.kt @@ -69,7 +69,8 @@ data class V2rayConfig( var settings: OutSettingsBean? = null, var streamSettings: StreamSettingsBean? = null, val sendThrough: String? = null, - var mux: MuxBean? = MuxBean(false) + var mux: MuxBean? = MuxBean(false), + var targetStrategy: String? = null ) { data class OutSettingsBean( /*Common */ @@ -99,7 +100,6 @@ data class V2rayConfig( var reserved: List? = null, var mtu: Int? = null, var remoteDNS: List? = null, - var domainStrategy: String? = null, ) { data class WireGuardBean( var publicKey: String = "", diff --git a/V2rayNG/app/src/main/res/values-ar/strings.xml b/V2rayNG/app/src/main/res/values-ar/strings.xml index e60345565..fd4a19532 100644 --- a/V2rayNG/app/src/main/res/values-ar/strings.xml +++ b/V2rayNG/app/src/main/res/values-ar/strings.xml @@ -103,7 +103,7 @@ Reserved (اختياري، مفصول بفواصل) العنوان المحلي (اختياري IPv4/IPv6، مفصولة بفواصل) MTU (اختياري، الافتراضي 1420) - remoteDNS (اختياري، عناوين IPv4/IPv6 مفصولة بفواصل، أو "local" لاستخدام DNS الجهاز) + remoteDNS (اختياري، عناوين IPv4/IPv6 مفصولة بفواصل) mKCP MTU (اختياري، الافتراضي 1350) mKCP TTI (اختياري، الافتراضي 50 مللي ثانية) نجاح diff --git a/V2rayNG/app/src/main/res/values-bn/strings.xml b/V2rayNG/app/src/main/res/values-bn/strings.xml index 9ea27f894..0188b077d 100644 --- a/V2rayNG/app/src/main/res/values-bn/strings.xml +++ b/V2rayNG/app/src/main/res/values-bn/strings.xml @@ -103,7 +103,7 @@ Reserved (ঐচ্ছিক, কমা দিয়ে পৃথক) স্থানীয় ঠিকানা (ঐচ্ছিক IPv4/IPv6, কমা দ্বারা পৃথক করা) MTU (ঐচ্ছিক, ডিফল্ট 1420) - remoteDNS (ঐচ্ছিক, কমা দ্বারা পৃথক করা IPv4/IPv6 ঠিকানা, অথবা ডিভাইসের DNS ব্যবহার করতে "local") + remoteDNS (ঐচ্ছিক, কমা দ্বারা পৃথক করা IPv4/IPv6 ঠিকানা) mKCP MTU (ঐচ্ছিক, ডিফল্ট 1350) mKCP TTI (ঐচ্ছিক, ডিফল্ট 50 মিলিসেকেন্ড) সফল diff --git a/V2rayNG/app/src/main/res/values-fa/strings.xml b/V2rayNG/app/src/main/res/values-fa/strings.xml index 87102c8ea..46058f7cc 100644 --- a/V2rayNG/app/src/main/res/values-fa/strings.xml +++ b/V2rayNG/app/src/main/res/values-fa/strings.xml @@ -103,7 +103,7 @@ Reserved (اختیاری، جدا شده با کاما) آدرس محلی (IPv4/IPv6 اختیاری، جدا شده با کاما) MTU (اختیاری، پیش‌فرض 1420) - remoteDNS (اختیاری، آدرس‌های IPv4/IPv6 جدا شده با کاما، یا "local" برای استفاده از DNS دستگاه) + remoteDNS (اختیاری، آدرس‌های IPv4/IPv6 جدا شده با کاما) mKCP MTU (اختیاری، پیش‌فرض 1350) mKCP TTI (اختیاری، پیش‌فرض 50 میلی‌ثانیه) موفقیت‌آمیز diff --git a/V2rayNG/app/src/main/res/values-ru/strings.xml b/V2rayNG/app/src/main/res/values-ru/strings.xml index 37aea7f3c..0efb8cfa7 100644 --- a/V2rayNG/app/src/main/res/values-ru/strings.xml +++ b/V2rayNG/app/src/main/res/values-ru/strings.xml @@ -103,7 +103,7 @@ Reserved (необязательно, через запятую) Локальный адрес (необязательно, IPv4/IPv6 через запятую) MTU (необязательно, по умолчанию 1420) - remoteDNS (необязательно, IPv4/IPv6-адреса через запятую, либо "local" для использования локального DNS) + remoteDNS (необязательно, IPv4/IPv6-адреса через запятую) mKCP MTU (необязательно, по умолчанию 1350) mKCP TTI (необязательно, по умолчанию 50 мс) Успешно diff --git a/V2rayNG/app/src/main/res/values-vi/strings.xml b/V2rayNG/app/src/main/res/values-vi/strings.xml index 353344ad2..82b5d6bc4 100644 --- a/V2rayNG/app/src/main/res/values-vi/strings.xml +++ b/V2rayNG/app/src/main/res/values-vi/strings.xml @@ -103,7 +103,7 @@ Reserved (không bắt buộc, phân cách bằng dấu phẩy) Địa chỉ cục bộ (IPv4/IPv6 không bắt buộc, phân cách bằng dấu phẩy) MTU (không bắt buộc, mặc định 1420) - remoteDNS (tùy chọn, các địa chỉ IPv4/IPv6 cách nhau bằng dấu phẩy, hoặc "local" để dùng DNS của thiết bị) + remoteDNS (tùy chọn, các địa chỉ IPv4/IPv6 cách nhau bằng dấu phẩy) mKCP MTU (không bắt buộc, mặc định 1350) mKCP TTI (không bắt buộc, mặc định 50 ms) Thành công! diff --git a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml index 0ef7b7dc2..652611754 100644 --- a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml @@ -103,7 +103,7 @@ Reserved (可选,逗号隔开) 本地地址 (可选 IPv4/IPv6,逗号隔开) MTU(可选,默认 1420) - remoteDNS(可选,多个 IPv4/IPv6 地址用逗号分隔,或填写 "local" 使用设备本地 DNS) + remoteDNS(可选,多个 IPv4/IPv6 地址用逗号分隔) mKCP MTU(可选,默认 1350) mKCP TTI(可选,默认 50 毫秒) 成功 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 6df2a80e8..9133cc228 100644 --- a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml +++ b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml @@ -103,7 +103,7 @@ Reserved (可選,逗號隔開) 本機位址 (可選 IPv4/IPv6,逗號隔開) MTU(可選,預設 1420) - remoteDNS(選填,多個 IPv4/IPv6 位址以逗號分隔,或輸入 "local" 使用裝置本機 DNS) + remoteDNS(選填,多個 IPv4/IPv6 位址以逗號分隔) mKCP MTU(可選,預設 1350) mKCP TTI(可選,預設 50 毫秒) 成功 diff --git a/V2rayNG/app/src/main/res/values/strings.xml b/V2rayNG/app/src/main/res/values/strings.xml index 8b2bd2f5e..f9178191f 100644 --- a/V2rayNG/app/src/main/res/values/strings.xml +++ b/V2rayNG/app/src/main/res/values/strings.xml @@ -103,7 +103,7 @@ Reserved (optional, separated by commas) Local address (optional IPv4/IPv6, separated by commas) MTU (optional, default 1420) - remoteDNS (optional, comma-separated IPv4/IPv6, or "local" to use device DNS) + remoteDNS (optional, comma-separated IPv4/IPv6) mKCP MTU (optional, default 1350) mKCP TTI (optional, default 50 ms) Success