From 4c1a817c1bff68d821278ad2be3ecee0574c6055 Mon Sep 17 00:00:00 2001 From: Mygod Date: Fri, 11 Mar 2016 22:17:06 +0800 Subject: [PATCH] Fix a crash on Android N preview --- .../com/github/shadowsocks/ShadowsocksSettings.scala | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala index ecdec22d..c99199fe 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala @@ -15,7 +15,7 @@ import android.webkit.{WebView, WebViewClient} import com.github.shadowsocks.database.Profile import com.github.shadowsocks.preferences._ import com.github.shadowsocks.utils.CloseUtils._ -import com.github.shadowsocks.utils.{Key, Utils} +import com.github.shadowsocks.utils.Key object ShadowsocksSettings { // Constants @@ -196,16 +196,10 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan private var enabled = true def setEnabled(enabled: Boolean) { this.enabled = enabled - findPreference(Key.isNAT).setEnabled(enabled) - for (name <- PROXY_PREFS) { + for (name <- Key.isNAT #:: PROXY_PREFS.toStream #::: FEATURE_PREFS.toStream) { val pref = findPreference(name) if (pref != null) pref.setEnabled(enabled) } - for (name <- FEATURE_PREFS) { - val pref = findPreference(name) - if (pref != null) pref.setEnabled(enabled && - (name != Key.isProxyApps || Utils.isLollipopOrAbove || !ShadowsocksApplication.isVpnEnabled)) - } } def update(profile: Profile) {