From b5146e4712849aaba9d2559203a1ba4b83c7ba99 Mon Sep 17 00:00:00 2001 From: 2dust <31833384+2dust@users.noreply.github.com> Date: Sat, 1 Nov 2025 11:12:15 +0800 Subject: [PATCH] Comment out per-app proxy setting in preferences --- .../java/com/v2ray/ang/ui/SettingsActivity.kt | 16 ++++++++-------- .../com/v2ray/ang/viewmodel/SettingsViewModel.kt | 2 +- V2rayNG/app/src/main/res/xml/pref_settings.xml | 8 ++++---- 3 files changed, 13 insertions(+), 13 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 1a577db2..29c7735c 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 @@ -37,7 +37,7 @@ class SettingsActivity : BaseActivity() { class SettingsFragment : PreferenceFragmentCompat() { - private val perAppProxy by lazy { findPreference(AppConfig.PREF_PER_APP_PROXY) } +// private val perAppProxy by lazy { findPreference(AppConfig.PREF_PER_APP_PROXY) } private val localDns by lazy { findPreference(AppConfig.PREF_LOCAL_DNS_ENABLED) } private val fakeDns by lazy { findPreference(AppConfig.PREF_FAKE_DNS_ENABLED) } private val appendHttpProxy by lazy { findPreference(AppConfig.PREF_APPEND_HTTP_PROXY) } @@ -74,11 +74,11 @@ class SettingsActivity : BaseActivity() { override fun onCreatePreferences(bundle: Bundle?, s: String?) { addPreferencesFromResource(R.xml.pref_settings) - perAppProxy?.setOnPreferenceClickListener { - startActivity(Intent(activity, PerAppProxyActivity::class.java)) - perAppProxy?.isChecked = true - false - } +// perAppProxy?.setOnPreferenceClickListener { +// startActivity(Intent(activity, PerAppProxyActivity::class.java)) +// perAppProxy?.isChecked = true +// false +// } localDns?.setOnPreferenceChangeListener { _, any -> updateLocalDns(any as Boolean) true @@ -298,8 +298,8 @@ class SettingsActivity : BaseActivity() { private fun updateMode(mode: String?) { val vpn = mode == VPN - perAppProxy?.isEnabled = vpn - perAppProxy?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_PER_APP_PROXY, false) +// perAppProxy?.isEnabled = vpn +// perAppProxy?.isChecked = MmkvManager.decodeSettingsBool(AppConfig.PREF_PER_APP_PROXY, false) localDns?.isEnabled = vpn fakeDns?.isEnabled = vpn appendHttpProxy?.isEnabled = vpn diff --git a/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt b/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt index aec6c6c5..202c33e7 100644 --- a/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt +++ b/V2rayNG/app/src/main/java/com/v2ray/ang/viewmodel/SettingsViewModel.kt @@ -75,7 +75,7 @@ class SettingsViewModel(application: Application) : AndroidViewModel(application AppConfig.PREF_APPEND_HTTP_PROXY, AppConfig.PREF_ALLOW_INSECURE, AppConfig.PREF_PREFER_IPV6, - AppConfig.PREF_PER_APP_PROXY, +// AppConfig.PREF_PER_APP_PROXY, AppConfig.PREF_BYPASS_APPS, AppConfig.PREF_CONFIRM_REMOVE, AppConfig.PREF_START_SCAN_IMMEDIATE, diff --git a/V2rayNG/app/src/main/res/xml/pref_settings.xml b/V2rayNG/app/src/main/res/xml/pref_settings.xml index 2ad26792..6264014a 100644 --- a/V2rayNG/app/src/main/res/xml/pref_settings.xml +++ b/V2rayNG/app/src/main/res/xml/pref_settings.xml @@ -25,10 +25,10 @@ android:summary="@string/summary_pref_prefer_ipv6" android:title="@string/title_pref_prefer_ipv6" /> - + + + +