Comment out local DNS port preference in settings
This commit is contained in:
1 parent
8aba43d448
commit
b4ac79e4fa
3 files changed
+16
-16
No files matched your search
@@ -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
|
||||
}
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in new issue
Block a user