mirror of
https://github.com/topjohnwu/Magisk.git
synced 2025-02-22 03:58:29 +00:00
Always fetch network state on process onStart
This commit is contained in:
parent
af054e4e31
commit
0e851cdcf8
@ -0,0 +1,12 @@
|
|||||||
|
package androidx.lifecycle;
|
||||||
|
|
||||||
|
import android.content.Context;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
|
|
||||||
|
public class ProcessLifecycleAccessor {
|
||||||
|
public static void init(@NonNull Context context) {
|
||||||
|
LifecycleDispatcher.init(context);
|
||||||
|
ProcessLifecycleOwner.init(context);
|
||||||
|
}
|
||||||
|
}
|
@ -5,9 +5,14 @@ import android.app.Application
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.res.Configuration
|
import android.content.res.Configuration
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
|
import androidx.lifecycle.ProcessLifecycleAccessor
|
||||||
import com.topjohnwu.magisk.StubApk
|
import com.topjohnwu.magisk.StubApk
|
||||||
import com.topjohnwu.magisk.core.di.ServiceLocator
|
import com.topjohnwu.magisk.core.di.ServiceLocator
|
||||||
import com.topjohnwu.magisk.core.utils.*
|
import com.topjohnwu.magisk.core.utils.DispatcherExecutor
|
||||||
|
import com.topjohnwu.magisk.core.utils.RootUtils
|
||||||
|
import com.topjohnwu.magisk.core.utils.ShellInit
|
||||||
|
import com.topjohnwu.magisk.core.utils.refreshLocale
|
||||||
|
import com.topjohnwu.magisk.core.utils.setConfig
|
||||||
import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
|
import com.topjohnwu.magisk.ui.surequest.SuRequestActivity
|
||||||
import com.topjohnwu.magisk.view.Notifications
|
import com.topjohnwu.magisk.view.Notifications
|
||||||
import com.topjohnwu.superuser.Shell
|
import com.topjohnwu.superuser.Shell
|
||||||
@ -74,6 +79,11 @@ open class App() : Application() {
|
|||||||
Notifications.setup()
|
Notifications.setup()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onCreate() {
|
||||||
|
super.onCreate()
|
||||||
|
ProcessLifecycleAccessor.init(this)
|
||||||
|
}
|
||||||
|
|
||||||
override fun onConfigurationChanged(newConfig: Configuration) {
|
override fun onConfigurationChanged(newConfig: Configuration) {
|
||||||
if (resources.configuration.diff(newConfig) != 0) {
|
if (resources.configuration.diff(newConfig) != 0) {
|
||||||
resources.setConfig(newConfig)
|
resources.setConfig(newConfig)
|
||||||
|
@ -11,6 +11,9 @@ import android.net.NetworkRequest
|
|||||||
import android.os.PowerManager
|
import android.os.PowerManager
|
||||||
import androidx.collection.ArraySet
|
import androidx.collection.ArraySet
|
||||||
import androidx.core.content.getSystemService
|
import androidx.core.content.getSystemService
|
||||||
|
import androidx.lifecycle.DefaultLifecycleObserver
|
||||||
|
import androidx.lifecycle.LifecycleOwner
|
||||||
|
import androidx.lifecycle.ProcessLifecycleOwner
|
||||||
import com.topjohnwu.magisk.ktx.registerRuntimeReceiver
|
import com.topjohnwu.magisk.ktx.registerRuntimeReceiver
|
||||||
|
|
||||||
typealias ConnectionCallback = (Boolean) -> Unit
|
typealias ConnectionCallback = (Boolean) -> Unit
|
||||||
@ -18,7 +21,7 @@ typealias ConnectionCallback = (Boolean) -> Unit
|
|||||||
class NetworkObserver(
|
class NetworkObserver(
|
||||||
context: Context,
|
context: Context,
|
||||||
private val callback: ConnectionCallback
|
private val callback: ConnectionCallback
|
||||||
) {
|
): DefaultLifecycleObserver {
|
||||||
private val manager = context.getSystemService<ConnectivityManager>()!!
|
private val manager = context.getSystemService<ConnectivityManager>()!!
|
||||||
|
|
||||||
private val networkCallback = object : ConnectivityManager.NetworkCallback() {
|
private val networkCallback = object : ConnectivityManager.NetworkCallback() {
|
||||||
@ -44,27 +47,33 @@ class NetworkObserver(
|
|||||||
if (context.isIdleMode()) {
|
if (context.isIdleMode()) {
|
||||||
callback(false)
|
callback(false)
|
||||||
} else {
|
} else {
|
||||||
getCurrentState()
|
postCurrentState()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
init {
|
init {
|
||||||
val builder = NetworkRequest.Builder()
|
val request = NetworkRequest.Builder()
|
||||||
builder.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
|
.addCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
|
||||||
manager.registerNetworkCallback(builder.build(), networkCallback)
|
.build()
|
||||||
|
manager.registerNetworkCallback(request, networkCallback)
|
||||||
val filter = IntentFilter(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED)
|
val filter = IntentFilter(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED)
|
||||||
context.applicationContext.registerRuntimeReceiver(receiver, filter)
|
context.applicationContext.registerRuntimeReceiver(receiver, filter)
|
||||||
|
ProcessLifecycleOwner.get().lifecycle.addObserver(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getCurrentState() {
|
override fun onStart(owner: LifecycleOwner) {
|
||||||
|
postCurrentState()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun postCurrentState() {
|
||||||
callback(manager.getNetworkCapabilities(manager.activeNetwork)
|
callback(manager.getNetworkCapabilities(manager.activeNetwork)
|
||||||
?.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) ?: false)
|
?.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED) ?: false)
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
fun observe(context: Context, callback: ConnectionCallback): NetworkObserver {
|
fun observe(context: Context, callback: ConnectionCallback): NetworkObserver {
|
||||||
return NetworkObserver(context, callback).apply { getCurrentState() }
|
return NetworkObserver(context, callback).apply { postCurrentState() }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user