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
556d8d78
Commit
556d8d78
authored
Jul 09, 2016
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Refine #530"
This reverts commit
56de231c
.
parent
929b8c94
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
src/main/scala/com/github/shadowsocks/ServiceBoundContext.scala
...in/scala/com/github/shadowsocks/ServiceBoundContext.scala
+1
-0
src/main/scala/com/github/shadowsocks/ShadowsocksNotification.scala
...cala/com/github/shadowsocks/ShadowsocksNotification.scala
+0
-3
No files found.
src/main/scala/com/github/shadowsocks/ServiceBoundContext.scala
View file @
556d8d78
...
@@ -62,6 +62,7 @@ trait ServiceBoundContext extends Context with IBinder.DeathRecipient {
...
@@ -62,6 +62,7 @@ trait ServiceBoundContext extends Context with IBinder.DeathRecipient {
connection
=
new
ShadowsocksServiceConnection
()
connection
=
new
ShadowsocksServiceConnection
()
bindService
(
intent
,
connection
,
Context
.
BIND_AUTO_CREATE
)
bindService
(
intent
,
connection
,
Context
.
BIND_AUTO_CREATE
)
startService
(
intent
)
}
}
}
}
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksNotification.scala
View file @
556d8d78
...
@@ -83,9 +83,7 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str
...
@@ -83,9 +83,7 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str
show
()
show
()
}
else
if
(
forceShow
)
show
()
}
else
if
(
forceShow
)
show
()
private
lazy
val
intent
=
new
Intent
(
service
,
service
.
getClass
)
def
show
()
=
{
def
show
()
=
{
service
.
startService
(
intent
)
service
.
startForeground
(
1
,
builder
.
build
)
service
.
startForeground
(
1
,
builder
.
build
)
}
}
...
@@ -96,7 +94,6 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str
...
@@ -96,7 +94,6 @@ class ShadowsocksNotification(private val service: BaseService, profileName: Str
}
}
unregisterCallback
unregisterCallback
service
.
stopForeground
(
true
)
service
.
stopForeground
(
true
)
service
.
stopService
(
intent
)
nm
.
cancel
(
1
)
nm
.
cancel
(
1
)
}
}
}
}
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