Commit 7c4a6c40 authored by Max Lv's avatar Max Lv

fix UI

parent 25bd9149
...@@ -169,10 +169,13 @@ object Typefaces { ...@@ -169,10 +169,13 @@ object Typefaces {
class Shadowsocks extends UnifiedSherlockPreferenceActivity with CompoundButton.OnCheckedChangeListener with OnSharedPreferenceChangeListener { class Shadowsocks extends UnifiedSherlockPreferenceActivity with CompoundButton.OnCheckedChangeListener with OnSharedPreferenceChangeListener {
private var progressDialog: ProgressDialog = null
private val MSG_CRASH_RECOVER: Int = 1 private val MSG_CRASH_RECOVER: Int = 1
private val MSG_INITIAL_FINISH: Int = 2 private val MSG_INITIAL_FINISH: Int = 2
private var switchButton: Switch = null
private var progressDialog: ProgressDialog = null
private var prepared = false
private def copyAssets(path: String) { private def copyAssets(path: String) {
val assetManager: AssetManager = getAssets val assetManager: AssetManager = getAssets
var files: Array[String] = null var files: Array[String] = null
...@@ -354,19 +357,15 @@ class Shadowsocks extends UnifiedSherlockPreferenceActivity with CompoundButton. ...@@ -354,19 +357,15 @@ class Shadowsocks extends UnifiedSherlockPreferenceActivity with CompoundButton.
super.onOptionsItemSelected(item) super.onOptionsItemSelected(item)
} }
protected override def onNewIntent(intent: Intent) {
super.onNewIntent(intent)
setIntent(intent)
}
protected override def onPause() { protected override def onPause() {
super.onPause() super.onPause()
prepared = false
PreferenceManager.getDefaultSharedPreferences(this).unregisterOnSharedPreferenceChangeListener(this) PreferenceManager.getDefaultSharedPreferences(this).unregisterOnSharedPreferenceChangeListener(this)
} }
protected override def onResume() { protected override def onResume() {
super.onResume() super.onResume()
if (getIntent.getAction != Shadowsocks.REQUEST_CONNECT) { if (!prepared) {
val settings: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(this) val settings: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(this)
if (isServiceStarted) { if (isServiceStarted) {
switchButton.setChecked(true) switchButton.setChecked(true)
...@@ -508,6 +507,7 @@ class Shadowsocks extends UnifiedSherlockPreferenceActivity with CompoundButton. ...@@ -508,6 +507,7 @@ class Shadowsocks extends UnifiedSherlockPreferenceActivity with CompoundButton.
override def onActivityResult(requestCode: Int, resultCode: Int, data: Intent) { override def onActivityResult(requestCode: Int, resultCode: Int, data: Intent) {
resultCode match { resultCode match {
case Activity.RESULT_OK => { case Activity.RESULT_OK => {
prepared = true
if (!serviceStart) { if (!serviceStart) {
switchButton.setChecked(false) switchButton.setChecked(false)
} }
...@@ -605,5 +605,5 @@ class Shadowsocks extends UnifiedSherlockPreferenceActivity with CompoundButton. ...@@ -605,5 +605,5 @@ class Shadowsocks extends UnifiedSherlockPreferenceActivity with CompoundButton.
super.handleMessage(msg) super.handleMessage(msg)
} }
} }
private var switchButton: Switch = null
} }
\ No newline at end of file
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