Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
7c4a6c40
Commit
7c4a6c40
authored
May 06, 2013
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix UI
parent
25bd9149
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+8
-8
No files found.
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
7c4a6c40
...
...
@@ -169,10 +169,13 @@ object Typefaces {
class
Shadowsocks
extends
UnifiedSherlockPreferenceActivity
with
CompoundButton
.
OnCheckedChangeListener
with
OnSharedPreferenceChangeListener
{
private
var
progressDialog
:
ProgressDialog
=
null
private
val
MSG_CRASH_RECOVER
:
Int
=
1
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
)
{
val
assetManager
:
AssetManager
=
getAssets
var
files
:
Array
[
String
]
=
null
...
...
@@ -354,19 +357,15 @@ class Shadowsocks extends UnifiedSherlockPreferenceActivity with CompoundButton.
super
.
onOptionsItemSelected
(
item
)
}
protected
override
def
onNewIntent
(
intent
:
Intent
)
{
super
.
onNewIntent
(
intent
)
setIntent
(
intent
)
}
protected
override
def
onPause
()
{
super
.
onPause
()
prepared
=
false
PreferenceManager
.
getDefaultSharedPreferences
(
this
).
unregisterOnSharedPreferenceChangeListener
(
this
)
}
protected
override
def
onResume
()
{
super
.
onResume
()
if
(
getIntent
.
getAction
!=
Shadowsocks
.
REQUEST_CONNECT
)
{
if
(
!
prepared
)
{
val
settings
:
SharedPreferences
=
PreferenceManager
.
getDefaultSharedPreferences
(
this
)
if
(
isServiceStarted
)
{
switchButton
.
setChecked
(
true
)
...
...
@@ -508,6 +507,7 @@ class Shadowsocks extends UnifiedSherlockPreferenceActivity with CompoundButton.
override
def
onActivityResult
(
requestCode
:
Int
,
resultCode
:
Int
,
data
:
Intent
)
{
resultCode
match
{
case
Activity
.
RESULT_OK
=>
{
prepared
=
true
if
(!
serviceStart
)
{
switchButton
.
setChecked
(
false
)
}
...
...
@@ -605,5 +605,5 @@ class Shadowsocks extends UnifiedSherlockPreferenceActivity with CompoundButton.
super
.
handleMessage
(
msg
)
}
}
private
var
switchButton
:
Switch
=
null
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment