javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(android): connectivity reporting none on resume (#9915)

Browse Source
This commit is contained in:
Jason Cassidy
2022-05-19 23:12:31 +01:00
committed by Nathan Walker
parent e8bed44f5b
commit 413fa2eb4b
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
packages/core/connectivity/index.android.ts
View File

@@ -32,8 +32,12 @@ function getActiveNetworkInfo(): android.net.NetworkInfo {
function getNetworkCapabilities() {
// @ts-ignore
const connectivityManager: any = getConnectivityManager();
const network = connectivityManager.getActiveNetwork();
const capabilities = connectivityManager.getNetworkCapabilities(network);
const networkToCheck = connectivityManager.getActiveNetwork();
const capabilities = connectivityManager.getNetworkCapabilities(networkToCheck);
return parseNetworkCapabilities(capabilities);
}
function parseNetworkCapabilities(capabilities?: android.net.NetworkCapabilities) {
if (capabilities == null) {
return connectionType.none;
}
@@ -116,8 +120,11 @@ export function startMonitoring(connectionTypeChangedCallback: (newConnectionTyp
if (android.os.Build.VERSION.SDK_INT >= 28) {
const manager = getConnectivityManager();
if (manager) {
notifyCallback = () => {
const newConnectionType = getConnectionType();
notifyCallback = (network: android.net.Network, networkCapabilities: android.net.NetworkCapabilities) => {
let newConnectionType = connectionType.none;
if (network && networkCapabilities) {
newConnectionType = parseNetworkCapabilities(networkCapabilities);
}
const zoneCallback = zonedCallback(connectionTypeChangedCallback);
zoneCallback(newConnectionType);
};
@@ -125,15 +132,9 @@ export function startMonitoring(connectionTypeChangedCallback: (newConnectionTyp
if (!networkCallback) {
@NativeClass
class NetworkCallbackImpl extends ConnectivityManager.NetworkCallback {
onAvailable(network: android.net.Network) {
if (notifyCallback) {
notifyCallback();
}
}
onCapabilitiesChanged(network: android.net.Network, networkCapabilities: android.net.NetworkCapabilities) {
if (notifyCallback) {
notifyCallback();
notifyCallback(network, networkCapabilities);
}
}