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
9f240ec3
Commit
9f240ec3
authored
Feb 11, 2019
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refine code style
parent
b288aa53
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
core/src/main/java/com/github/shadowsocks/net/DefaultNetworkListener.kt
...java/com/github/shadowsocks/net/DefaultNetworkListener.kt
+9
-9
No files found.
core/src/main/java/com/github/shadowsocks/net/DefaultNetworkListener.kt
View file @
9f240ec3
...
...
@@ -55,7 +55,7 @@ object DefaultNetworkListener : CoroutineScope {
val
pendingRequests
=
arrayListOf
<
NetworkMessage
.
Get
>()
for
(
message
in
channel
)
when
(
message
)
{
is
NetworkMessage
.
Start
->
{
if
(
listeners
.
isEmpty
())
register
DefaultNetworkListener
()
if
(
listeners
.
isEmpty
())
register
()
listeners
[
message
.
key
]
=
message
.
listener
if
(
network
!=
null
)
message
.
listener
(
network
)
}
...
...
@@ -66,7 +66,7 @@ object DefaultNetworkListener : CoroutineScope {
is
NetworkMessage
.
Stop
->
if
(!
listeners
.
isEmpty
()
&&
// was not empty
listeners
.
remove
(
message
.
key
)
!=
null
&&
listeners
.
isEmpty
())
{
network
=
null
unregister
DefaultNetworkListener
()
unregister
()
}
is
NetworkMessage
.
Put
->
{
...
...
@@ -104,10 +104,10 @@ object DefaultNetworkListener : CoroutineScope {
private
var
fallback
=
false
private
val
connectivity
=
app
.
getSystemService
<
ConnectivityManager
>()
!!
private
val
defaultNetworkRequest
=
NetworkRequest
.
Builder
()
.
addCapability
(
NetworkCapabilities
.
NET_CAPABILITY_INTERNET
)
.
addCapability
(
NetworkCapabilities
.
NET_CAPABILITY_NOT_RESTRICTED
)
.
build
()
private
val
request
=
NetworkRequest
.
Builder
().
apply
{
addCapability
(
NetworkCapabilities
.
NET_CAPABILITY_INTERNET
)
addCapability
(
NetworkCapabilities
.
NET_CAPABILITY_NOT_RESTRICTED
)
}
.
build
()
/**
* Unfortunately registerDefaultNetworkCallback is going to return VPN interface since Android P DP1:
* https://android.googlesource.com/platform/frameworks/base/+/dda156ab0c5d66ad82bdcf76cda07cbc0a9c8a2e
...
...
@@ -118,18 +118,18 @@ object DefaultNetworkListener : CoroutineScope {
*
* Source: https://android.googlesource.com/platform/frameworks/base/+/2df4c7d/services/core/java/com/android/server/ConnectivityService.java#887
*/
private
fun
register
DefaultNetworkListener
()
{
private
fun
register
()
{
if
(
Build
.
VERSION
.
SDK_INT
in
24
..
27
)
@TargetApi
(
24
)
{
connectivity
.
registerDefaultNetworkCallback
(
Callback
)
}
else
try
{
fallback
=
false
// we want REQUEST here instead of LISTEN
connectivity
.
requestNetwork
(
defaultNetworkR
equest
,
Callback
)
connectivity
.
requestNetwork
(
r
equest
,
Callback
)
}
catch
(
e
:
SecurityException
)
{
// known bug: https://stackoverflow.com/a/33509180/2245107
if
(
Build
.
VERSION
.
SDK_INT
!=
23
)
Crashlytics
.
logException
(
e
)
fallback
=
true
}
}
private
fun
unregister
DefaultNetworkListener
()
=
connectivity
.
unregisterNetworkCallback
(
Callback
)
private
fun
unregister
()
=
connectivity
.
unregisterNetworkCallback
(
Callback
)
}
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