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
bb81fe13
Commit
bb81fe13
authored
Oct 05, 2015
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix close receiver
parent
66d70f15
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
14 deletions
+15
-14
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+15
-14
No files found.
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
bb81fe13
...
...
@@ -68,10 +68,10 @@ class ShadowsocksVpnService extends VpnService with BaseService {
val
PRIVATE_VLAN
=
"26.26.26.%s"
val
PRIVATE_VLAN6
=
"fdfe:dcba:9876::%s"
var
conn
:
ParcelFileDescriptor
=
null
var
receiver
:
BroadcastReceiver
=
null
var
apps
:
Array
[
ProxiedApp
]
=
null
var
config
:
Config
=
null
var
vpnThread
:
ShadowsocksVpnThread
=
null
var
closeReceiver
:
BroadcastReceiver
=
null
def
isByass
(
net
:
SubnetUtils
)
:
Boolean
=
{
val
info
=
net
.
getInfo
...
...
@@ -171,10 +171,10 @@ class ShadowsocksVpnService extends VpnService with BaseService {
stopSelf
()
}
// clean up
the context
if
(
r
eceiver
!=
null
)
{
unregisterReceiver
(
r
eceiver
)
r
eceiver
=
null
// clean up
recevier
if
(
closeR
eceiver
!=
null
)
{
unregisterReceiver
(
closeR
eceiver
)
closeR
eceiver
=
null
}
// channge the state
...
...
@@ -211,6 +211,16 @@ class ShadowsocksVpnService extends VpnService with BaseService {
config
=
c
// register close receiver
val
filter
=
new
IntentFilter
()
filter
.
addAction
(
Intent
.
ACTION_SHUTDOWN
)
filter
.
addAction
(
Action
.
CLOSE
)
closeReceiver
=
(
context
:
Context
,
intent
:
Intent
)
=>
{
Toast
.
makeText
(
context
,
R
.
string
.
stopping
,
Toast
.
LENGTH_SHORT
).
show
()
stopRunner
()
}
registerReceiver
(
closeReceiver
,
filter
)
// ensure the VPNService is prepared
if
(
VpnService
.
prepare
(
this
)
!=
null
)
{
val
i
=
new
Intent
(
this
,
classOf
[
ShadowsocksRunnerActivity
])
...
...
@@ -226,15 +236,6 @@ class ShadowsocksVpnService extends VpnService with BaseService {
.
setLabel
(
getVersionName
)
.
build
())
// register close receiver
val
filter
=
new
IntentFilter
()
filter
.
addAction
(
Intent
.
ACTION_SHUTDOWN
)
receiver
=
(
p1
:
Context
,
p2
:
Intent
)
=>
{
Toast
.
makeText
(
p1
,
R
.
string
.
stopping
,
Toast
.
LENGTH_SHORT
)
stopRunner
()
}
registerReceiver
(
receiver
,
filter
)
changeState
(
State
.
CONNECTING
)
Future
{
...
...
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