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
9983b462
Commit
9983b462
authored
Feb 13, 2014
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make service control functions asynchronous
parent
29686ee8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
19 deletions
+6
-19
src/main/java/com/github/shadowsocks/aidl/IShadowsocksService.aidl
...java/com/github/shadowsocks/aidl/IShadowsocksService.aidl
+5
-3
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+1
-16
No files found.
src/main/java/com/github/shadowsocks/aidl/IShadowsocksService.aidl
View file @
9983b462
...
@@ -6,8 +6,10 @@ import com.github.shadowsocks.aidl.IShadowsocksServiceCallback;
...
@@ -6,8 +6,10 @@ import com.github.shadowsocks.aidl.IShadowsocksServiceCallback;
interface
IShadowsocksService
{
interface
IShadowsocksService
{
int
getMode
();
int
getMode
();
int
getState
();
int
getState
();
void
start
(
in
Config
config
);
void
stop
();
void
registerCallback
(
IShadowsocksServiceCallback
cb
);
void
registerCallback
(
IShadowsocksServiceCallback
cb
);
void
unregisterCallback
(
IShadowsocksServiceCallback
cb
);
void
unregisterCallback
(
IShadowsocksServiceCallback
cb
);
oneway
void
start
(
in
Config
config
);
oneway
void
stop
();
}
}
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
9983b462
...
@@ -317,12 +317,6 @@ class Shadowsocks
...
@@ -317,12 +317,6 @@ class Shadowsocks
// Update the UI
// Update the UI
switchButton
.
setEnabled
(
true
)
switchButton
.
setEnabled
(
true
)
if
(
State
.
isAvailable
(
bgService
.
getState
))
{
if
(
State
.
isAvailable
(
bgService
.
getState
))
{
if
(
status
.
getBoolean
(
Key
.
isRunning
,
false
))
{
spawn
{
crash_recovery
()
handler
.
sendEmptyMessage
(
MSG_CRASH_RECOVER
)
}
}
Crouton
.
cancelAllCroutons
()
Crouton
.
cancelAllCroutons
()
setPreferenceEnabled
(
enabled
=
true
)
setPreferenceEnabled
(
enabled
=
true
)
}
else
{
}
else
{
...
@@ -347,16 +341,7 @@ class Shadowsocks
...
@@ -347,16 +341,7 @@ class Shadowsocks
lazy
val
profileManager
=
lazy
val
profileManager
=
new
ProfileManager
(
settings
,
getApplication
.
asInstanceOf
[
ShadowsocksApplication
].
dbHelper
)
new
ProfileManager
(
settings
,
getApplication
.
asInstanceOf
[
ShadowsocksApplication
].
dbHelper
)
private
val
handler
:
Handler
=
new
Handler
{
val
handler
=
new
Handler
()
override
def
handleMessage
(
msg
:
Message
)
{
msg
.
what
match
{
case
MSG_CRASH_RECOVER
=>
Crouton
.
makeText
(
Shadowsocks
.
this
,
R
.
string
.
crash_alert
,
Style
.
ALERT
).
show
()
status
.
edit
().
putBoolean
(
Key
.
isRunning
,
false
).
commit
()
}
super
.
handleMessage
(
msg
)
}
}
private
def
changeSwitch
(
checked
:
Boolean
)
{
private
def
changeSwitch
(
checked
:
Boolean
)
{
switchButton
.
setOnCheckedChangeListener
(
null
)
switchButton
.
setOnCheckedChangeListener
(
null
)
...
...
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