Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
a4a73445
Commit
a4a73445
authored
Dec 09, 2022
by
vvb2060
Committed by
John Wu
Dec 26, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix network capabilities
parent
f989756b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
LollipopNetworkObserver.kt
...opjohnwu/magisk/core/utils/net/LollipopNetworkObserver.kt
+8
-6
MarshmallowNetworkObserver.kt
...ohnwu/magisk/core/utils/net/MarshmallowNetworkObserver.kt
+1
-3
No files found.
app/src/main/java/com/topjohnwu/magisk/core/utils/net/LollipopNetworkObserver.kt
View file @
a4a73445
package
com.topjohnwu.magisk.core.utils.net
package
com.topjohnwu.magisk.core.utils.net
import
android.annotation.TargetApi
import
android.content.Context
import
android.content.Context
import
android.net.ConnectivityManager
import
android.net.ConnectivityManager
import
android.net.Network
import
android.net.Network
import
android.net.NetworkCapabilities
import
android.net.NetworkCapabilities
import
android.net.NetworkRequest
import
android.net.NetworkRequest
import
android.os.Build
import
androidx.collection.ArraySet
import
androidx.collection.ArraySet
@TargetApi
(
21
)
open
class
LollipopNetworkObserver
(
open
class
LollipopNetworkObserver
(
context
:
Context
,
context
:
Context
,
callback
:
ConnectionCallback
callback
:
ConnectionCallback
...
@@ -17,10 +16,13 @@ open class LollipopNetworkObserver(
...
@@ -17,10 +16,13 @@ open class LollipopNetworkObserver(
private
val
networkCallback
=
NetCallback
()
private
val
networkCallback
=
NetCallback
()
init
{
init
{
val
request
=
NetworkRequest
.
Builder
()
val
builder
=
NetworkRequest
.
Builder
()
.
addCapability
(
NetworkCapabilities
.
NET_CAPABILITY_INTERNET
)
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
M
)
{
.
build
()
builder
.
addCapability
(
NetworkCapabilities
.
NET_CAPABILITY_VALIDATED
)
manager
.
registerNetworkCallback
(
request
,
networkCallback
)
}
else
{
builder
.
addCapability
(
NetworkCapabilities
.
NET_CAPABILITY_INTERNET
)
}
manager
.
registerNetworkCallback
(
builder
.
build
(),
networkCallback
)
}
}
@Suppress
(
"DEPRECATION"
)
@Suppress
(
"DEPRECATION"
)
...
...
app/src/main/java/com/topjohnwu/magisk/core/utils/net/MarshmallowNetworkObserver.kt
View file @
a4a73445
@file
:
Suppress
(
"DEPRECATION"
)
package
com.topjohnwu.magisk.core.utils.net
package
com.topjohnwu.magisk.core.utils.net
import
android.annotation.TargetApi
import
android.annotation.TargetApi
...
@@ -32,7 +30,7 @@ class MarshmallowNetworkObserver(
...
@@ -32,7 +30,7 @@ class MarshmallowNetworkObserver(
override
fun
getCurrentState
()
{
override
fun
getCurrentState
()
{
callback
(
manager
.
getNetworkCapabilities
(
manager
.
activeNetwork
)
callback
(
manager
.
getNetworkCapabilities
(
manager
.
activeNetwork
)
?.
hasCapability
(
NetworkCapabilities
.
NET_CAPABILITY_
INTERNET
)
?:
false
)
?.
hasCapability
(
NetworkCapabilities
.
NET_CAPABILITY_
VALIDATED
)
?:
false
)
}
}
private
inner
class
IdleBroadcastReceiver
:
BroadcastReceiver
()
{
private
inner
class
IdleBroadcastReceiver
:
BroadcastReceiver
()
{
...
...
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