katekate/v2rayNG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Comment out per-app proxy setting in preferences

Browse Source
This commit is contained in:
2dust
2025-11-01 11:12:15 +08:00
parent 4457b6b2c9
commit b5146e4712
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
V2rayNG/app/src/main/java/com/v2ray/ang/ui/SettingsActivity.kt
View File

@@ -37,7 +37,7 @@ class SettingsActivity : BaseActivity() {
class SettingsFragment : PreferenceFragmentCompat() { class SettingsFragment : PreferenceFragmentCompat() {
private val perAppProxy by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_PER_APP_PROXY) } // private val perAppProxy by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_PER_APP_PROXY) }
private val localDns by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_LOCAL_DNS_ENABLED) } 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 fakeDns by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_FAKE_DNS_ENABLED) }
private val appendHttpProxy by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_APPEND_HTTP_PROXY) } private val appendHttpProxy by lazy { findPreference<CheckBoxPreference>(AppConfig.PREF_APPEND_HTTP_PROXY) }
@@ -74,11 +74,11 @@ class SettingsActivity : BaseActivity() {
override fun onCreatePreferences(bundle: Bundle?, s: String?) { override fun onCreatePreferences(bundle: Bundle?, s: String?) {
addPreferencesFromResource(R.xml.pref_settings) addPreferencesFromResource(R.xml.pref_settings)
perAppProxy?.setOnPreferenceClickListener { // perAppProxy?.setOnPreferenceClickListener {
startActivity(Intent(activity, PerAppProxyActivity::class.java)) // startActivity(Intent(activity, PerAppProxyActivity::class.java))
perAppProxy?.isChecked = true // perAppProxy?.isChecked = true
false // false
} // }
localDns?.setOnPreferenceChangeListener { _, any -> localDns?.setOnPreferenceChangeListener { _, any ->
updateLocalDns(any as Boolean) updateLocalDns(any as Boolean)
true true
@@ -298,8 +298,8 @@ class SettingsActivity : BaseActivity() {
private fun updateMode(mode: String?) { private fun updateMode(mode: String?) {
val vpn = mode == VPN val vpn = mode == VPN
perAppProxy?.isEnabled = vpn // perAppProxy?.isEnabled = vpn
perAppProxy?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_PER_APP_PROXY, false) // perAppProxy?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_PER_APP_PROXY, false)
localDns?.isEnabled = vpn localDns?.isEnabled = vpn
fakeDns?.isEnabled = vpn fakeDns?.isEnabled = vpn
appendHttpProxy?.isEnabled = vpn appendHttpProxy?.isEnabled = vpn

2
V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt
View File

@@ -75,7 +75,7 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application
AppConfig.PREF_APPEND_HTTP_PROXY, AppConfig.PREF_APPEND_HTTP_PROXY,
AppConfig.PREF_ALLOW_INSECURE, AppConfig.PREF_ALLOW_INSECURE,
AppConfig.PREF_PREFER_IPV6, AppConfig.PREF_PREFER_IPV6,
AppConfig.PREF_PER_APP_PROXY, // AppConfig.PREF_PER_APP_PROXY,
AppConfig.PREF_BYPASS_APPS, AppConfig.PREF_BYPASS_APPS,
AppConfig.PREF_CONFIRM_REMOVE, AppConfig.PREF_CONFIRM_REMOVE,
AppConfig.PREF_START_SCAN_IMMEDIATE, AppConfig.PREF_START_SCAN_IMMEDIATE,

8
V2rayNG/app/src/main/res/xml/pref_settings.xml
View File

@@ -25,10 +25,10 @@
android:summary="@string/summary_pref_prefer_ipv6" android:summary="@string/summary_pref_prefer_ipv6"
android:title="@string/title_pref_prefer_ipv6" /> android:title="@string/title_pref_prefer_ipv6" />
<CheckBoxPreference <!-- <CheckBoxPreference-->
android:key="pref_per_app_proxy" <!-- android:key="pref_per_app_proxy"-->
android:summary="@string/summary_pref_per_app_proxy" <!-- android:summary="@string/summary_pref_per_app_proxy"-->
android:title="@string/title_pref_per_app_proxy" /> <!-- android:title="@string/title_pref_per_app_proxy" />-->
<CheckBoxPreference <CheckBoxPreference
android:key="pref_local_dns_enabled" android:key="pref_local_dns_enabled"