Commit 10ebf884 authored by Mygod's avatar Mygod

Merge branch 'master' of shadowsocks/shadowsocks-android

parents 62a572ee e82c7ccb
...@@ -221,6 +221,7 @@ class AppManager extends AppCompatActivity with OnCheckedChangeListener with OnC ...@@ -221,6 +221,7 @@ class AppManager extends AppCompatActivity with OnCheckedChangeListener with OnC
WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE |
WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE, PixelFormat.TRANSLUCENT)) WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE, PixelFormat.TRANSLUCENT))
ShadowsocksApplication.settings.edit().putBoolean(Key.isProxyApps, true).commit()
findViewById(R.id.onSwitch).asInstanceOf[Switch] findViewById(R.id.onSwitch).asInstanceOf[Switch]
.setOnCheckedChangeListener((button: CompoundButton, checked: Boolean) => { .setOnCheckedChangeListener((button: CompoundButton, checked: Boolean) => {
ShadowsocksApplication.settings.edit().putBoolean(Key.isProxyApps, checked).commit() ShadowsocksApplication.settings.edit().putBoolean(Key.isProxyApps, checked).commit()
......
package com.github.shadowsocks package com.github.shadowsocks
import java.lang.System.currentTimeMillis import java.lang.System.currentTimeMillis
import java.lang.{Long => jLong}
import java.net.{HttpURLConnection, URL} import java.net.{HttpURLConnection, URL}
import java.util.Locale import java.util.Locale
...@@ -67,6 +66,11 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan ...@@ -67,6 +66,11 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan
}) })
isProxyApps = findPreference(Key.isProxyApps).asInstanceOf[SwitchPreference] 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) => { findPreference("recovery").setOnPreferenceClickListener((preference: Preference) => {
ShadowsocksApplication.track(Shadowsocks.TAG, "reset") ShadowsocksApplication.track(Shadowsocks.TAG, "reset")
...@@ -108,15 +112,10 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan ...@@ -108,15 +112,10 @@ class ShadowsocksSettings extends PreferenceFragment with OnSharedPreferenceChan
override def onResume { override def onResume {
super.onResume() super.onResume()
isProxyApps.setChecked(ShadowsocksApplication.settings.getBoolean(Key.isProxyApps, false)) // update isProxyApps.setChecked(ShadowsocksApplication.settings.getBoolean(Key.isProxyApps, false)) // update
isProxyApps.setOnPreferenceChangeListener((preference: Preference, newValue: Any) => {
startActivity(new Intent(activity, classOf[AppManager]))
newValue.asInstanceOf[Boolean] // keep it ON
})
} }
override def onPause { override def onPause {
super.onPause() super.onPause()
isProxyApps.setOnPreferenceChangeListener(null)
} }
def onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) = key match { def onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) = key match {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment