Try to use registerBestMatchingNetworkCallback

This commit is contained in:
Mygod
2021-04-22 16:31:59 -04:00
parent a67d435c76
commit 4b55227ed0

View File

@@ -6,6 +6,8 @@ import android.net.LinkProperties
import android.net.Network
import android.net.NetworkCapabilities
import android.os.Build
import android.os.Handler
import android.os.Looper
import be.mygod.vpnhotspot.util.Services
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
@@ -51,9 +53,15 @@ object DefaultNetworkMonitor : UpstreamMonitor() {
callback.onAvailable(currentLinkProperties)
}
} else {
if (Build.VERSION.SDK_INT in 24..27) @TargetApi(24) {
when (Build.VERSION.SDK_INT) {
in 31..Int.MAX_VALUE -> @TargetApi(31) {
Services.connectivity.registerBestMatchingNetworkCallback(networkRequest, networkCallback,
Handler(Looper.getMainLooper()))
}
in 24..27 -> @TargetApi(24) {
Services.connectivity.registerDefaultNetworkCallback(networkCallback)
} else try {
}
else -> try {
Services.connectivity.requestNetwork(networkRequest, networkCallback)
} catch (e: SecurityException) {
// SecurityException would be thrown in requestNetwork on Android 6.0 thanks to Google's stupid bug
@@ -61,6 +69,7 @@ object DefaultNetworkMonitor : UpstreamMonitor() {
GlobalScope.launch { callback.onFallback() }
return
}
}
registered = true
}
}