From b4ac79e4fa4cce07d1cc7e42b64e729a7b993ed4 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Thu, 1 Jan 2026 16:46:54 +0800
Subject: [PATCH] Comment out local DNS port preference in settings

---
 .../java/com/v2ray/ang/ui/SettingsActivity.kt | 20 +++++++++----------
 .../app/src/main/res/xml/pref_settings.xml    | 10 +++++-----
 V2rayNG/gradle/libs.versions.toml             |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt
index 4d56a65c..b6c8c482 100644
--- a/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt
+++ b/V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt
@@ -40,7 +40,7 @@ class SettingsActivity : BaseActivity() {
         private val localDns by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_LOCAL_DNS_ENABLED) }
         private val fakeDns by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_FAKE_DNS_ENABLED) }
         private val appendHttpProxy by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_APPEND_HTTP_PROXY) }
-        private val localDnsPort by lazy { findPreference<EditTextPreference>(AppConfig.PREF_LOCAL_DNS_PORT) }
+//        private val localDnsPort by lazy { findPreference<EditTextPreference>(AppConfig.PREF_LOCAL_DNS_PORT) }
         private val vpnDns by lazy { findPreference<EditTextPreference>(AppConfig.PREF_VPN_DNS) }
         private val vpnBypassLan by lazy { findPreference<ListPreference>(AppConfig.PREF_VPN_BYPASS_LAN) }
         private val vpnInterfaceAddress by lazy { findPreference<ListPreference>(AppConfig.PREF_VPN_INTERFACE_ADDRESS_CONFIG_INDEX) }
@@ -83,11 +83,11 @@ class SettingsActivity : BaseActivity() {
                 updateLocalDns(any as Boolean)
                 true
             }
-            localDnsPort?.setOnPreferenceChangeListener { _, any ->
-                val nval = any as String
-                localDnsPort?.summary =  nval.ifEmpty { AppConfig.PORT_LOCAL_DNS }
-                true
-            }
+//            localDnsPort?.setOnPreferenceChangeListener { _, any ->
+//                val nval = any as String
+//                localDnsPort?.summary =  nval.ifEmpty { AppConfig.PORT_LOCAL_DNS }
+//                true
+//            }
             vpnDns?.setOnPreferenceChangeListener { _, any ->
                 vpnDns?.summary = any as String
                 true
@@ -205,7 +205,7 @@ class SettingsActivity : BaseActivity() {
             localDns?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_LOCAL_DNS_ENABLED, false)
             fakeDns?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_FAKE_DNS_ENABLED, false)
             appendHttpProxy?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_APPEND_HTTP_PROXY, false)
-            localDnsPort?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT, AppConfig.PORT_LOCAL_DNS)
+//            localDnsPort?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_LOCAL_DNS_PORT, AppConfig.PORT_LOCAL_DNS)
             vpnDns?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_DNS, AppConfig.DNS_VPN)
             vpnMtu?.summary = MmkvManager.decodeSettingsString(AppConfig.PREF_VPN_MTU, AppConfig.VPN_MTU.toString())
 
@@ -240,7 +240,7 @@ class SettingsActivity : BaseActivity() {
 
         private fun initSharedPreference() {
             listOf(
-                localDnsPort,
+                //localDnsPort,
                 vpnDns,
                 vpnMtu,
                 muxConcurrency,
@@ -308,7 +308,7 @@ class SettingsActivity : BaseActivity() {
             localDns?.isEnabled = vpn
             fakeDns?.isEnabled = vpn
             appendHttpProxy?.isEnabled = vpn
-            localDnsPort?.isEnabled = vpn
+//            localDnsPort?.isEnabled = vpn
             vpnDns?.isEnabled = vpn
             vpnBypassLan?.isEnabled = vpn
             vpnInterfaceAddress?.isEnabled = vpn
@@ -325,7 +325,7 @@ class SettingsActivity : BaseActivity() {
 
         private fun updateLocalDns(enabled: Boolean) {
             fakeDns?.isEnabled = enabled
-            localDnsPort?.isEnabled = enabled
+//            localDnsPort?.isEnabled = enabled
             vpnDns?.isEnabled = !enabled
         }
 
diff --git a/V2rayNG/app/src/main/res/xml/pref_settings.xml b/V2rayNG/app/src/main/res/xml/pref_settings.xml
index df5b58ec..8fbcbbbd 100644
--- a/V2rayNG/app/src/main/res/xml/pref_settings.xml
+++ b/V2rayNG/app/src/main/res/xml/pref_settings.xml
@@ -45,11 +45,11 @@
             android:summary="@string/summary_pref_append_http_proxy"
             android:title="@string/title_pref_append_http_proxy" />
 
-        <EditTextPreference
-            android:inputType="number"
-            android:key="pref_local_dns_port"
-            android:summary="10853"
-            android:title="@string/title_pref_local_dns_port" />
+<!--        <EditTextPreference-->
+<!--            android:inputType="number"-->
+<!--            android:key="pref_local_dns_port"-->
+<!--            android:summary="10853"-->
+<!--            android:title="@string/title_pref_local_dns_port" />-->
 
         <EditTextPreference
             android:key="pref_vpn_dns"
diff --git a/V2rayNG/gradle/libs.versions.toml b/V2rayNG/gradle/libs.versions.toml
index 7a126952..0b966e1e 100644
--- a/V2rayNG/gradle/libs.versions.toml
+++ b/V2rayNG/gradle/libs.versions.toml
@@ -23,7 +23,7 @@ core = "3.5.4"
 workRuntimeKtx = "2.11.0"
 lifecycleViewmodelKtx = "2.10.0"
 multidex = "2.0.1"
-mockitoMockitoInline = "5.2.0"
+mockitoMockitoInline = "6.1.0"
 flexbox = "3.0.0"
 preferenceKtx = "1.2.1"
 recyclerview = "1.4.0"