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

jcassidyav · NathanWalker · commit 413fa2eb4b04 · 2022-07-09T09:02:45.000-07:00
diff --git a/packages/core/connectivity/index.android.ts b/packages/core/connectivity/index.android.ts
@@ -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,24 +120,21 @@ 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);
 			};
 			const ConnectivityManager = android.net.ConnectivityManager;
 			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);
 						}
 					}
 
