From e82c7ccb9965ddb30b91aa7678bf0b972f580a0a Mon Sep 17 00:00:00 2001 From: Max Lv Date: Tue, 15 Dec 2015 18:25:24 +0800 Subject: [PATCH] Refine #478 --- .../scala/com/github/shadowsocks/AppManager.scala | 6 ++++-- .../com/github/shadowsocks/ShadowsocksSettings.scala | 12 +++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/AppManager.scala b/src/main/scala/com/github/shadowsocks/AppManager.scala index 2a3b5a55..f08ea93d 100644 --- a/src/main/scala/com/github/shadowsocks/AppManager.scala +++ b/src/main/scala/com/github/shadowsocks/AppManager.scala @@ -221,8 +221,10 @@ class AppManager extends AppCompatActivity with OnCheckedChangeListener with OnC WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE, PixelFormat.TRANSLUCENT)) - findViewById(R.id.onSwitch).asInstanceOf[Switch] - .setOnCheckedChangeListener((button: CompoundButton, checked: Boolean) => { + ShadowsocksApplication.settings.edit().putBoolean(Key.isProxyApps, true).commit() + val onSwitch = findViewById(R.id.onSwitch).asInstanceOf[Switch] + onSwitch.setChecked(true) + onSwitch.setOnCheckedChangeListener((button: CompoundButton, checked: Boolean) => { ShadowsocksApplication.settings.edit().putBoolean(Key.isProxyApps, checked).commit() finish() }) diff --git a/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala b/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala index 6dd51b30..e09d3729 100644 --- a/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala +++ b/src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala @@ -24,6 +24,11 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan getPreferenceManager.getSharedPreferences.registerOnSharedPreferenceChangeListener(this) isProxyApps = findPreference(Key.isProxyApps).asInstanceOf[SwitchPreference] + isProxyApps.setOnPreferenceClickListener((preference: Preference) => { + startActivity(new Intent(activity, classOf[AppManager])) + isProxyApps.setChecked(true) + false + }) findPreference("recovery").setOnPreferenceClickListener((preference: Preference) => { ShadowsocksApplication.track(Shadowsocks.TAG, "reset") @@ -65,17 +70,10 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan override def onResume { super.onResume() isProxyApps.setChecked(ShadowsocksApplication.settings.getBoolean(Key.isProxyApps, false)) // update - isProxyApps.setOnPreferenceChangeListener((preference: Preference, newValue: Any) => { - if (newValue.asInstanceOf[Boolean] == true) { - startActivity(new Intent(activity, classOf[AppManager])) - } - true - }) } override def onPause { super.onPause() - isProxyApps.setOnPreferenceChangeListener(null) } def onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) = key match {