fix(connectivity_plus): Fix connectivity state update on Android when…

… network is lost (#2673)
fluttercommunity · Mar 11, 2024 · 2119168 · 2119168
1 parent 915a443
commit 2119168
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/...ages/connectivity_plus/connectivity_plus/android/gradle/wrapper/gradle-wrapper.properties b/...ages/connectivity_plus/connectivity_plus/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/...d/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java b/...d/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java
@@ -10,6 +10,7 @@
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.net.Network;
+import android.net.NetworkCapabilities;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
@@ -48,9 +49,15 @@ public void onAvailable(Network network) {
               sendEvent();
             }
 
+            @Override
+            public void onCapabilitiesChanged(
+                Network network, NetworkCapabilities networkCapabilities) {
+              sendEvent();
+            }
+
             @Override
             public void onLost(Network network) {
-              sendEvent(Connectivity.CONNECTIVITY_NONE);
+              sendEvent();
             }
           };
       connectivity.getConnectivityManager().registerDefaultNetworkCallback(networkCallback);
@@ -70,7 +77,7 @@ public void onCancel(Object arguments) {
       try {
         context.unregisterReceiver(this);
       } catch (Exception e) {
-        //listen never called, ignore the error
+        // listen never called, ignore the error
       }
     }
   }
@@ -84,11 +91,9 @@ public void onReceive(Context context, Intent intent) {
 
   private void sendEvent() {
     Runnable runnable = () -> events.success(connectivity.getNetworkTypes());
-    mainHandler.post(runnable);
-  }
-
-  private void sendEvent(final String networkType) {
-    Runnable runnable = () -> events.success(networkType);
-    mainHandler.post(runnable);
+    // The dalay is needed because callback methods suffer from race conditions.
+    // More info:
+    // https://developer.android.com/develop/connectivity/network-ops/reading-network-state#listening-events
+    mainHandler.postDelayed(runnable, 100);
   }
 }
diff --git a/...nnectivity_plus/connectivity_plus_platform_interface/lib/method_channel_connectivity.dart b/...nnectivity_plus/connectivity_plus_platform_interface/lib/method_channel_connectivity.dart
@@ -29,8 +29,7 @@ class MethodChannelConnectivity extends ConnectivityPlatform {
   Stream<List<ConnectivityResult>> get onConnectivityChanged {
     _onConnectivityChanged ??= eventChannel
         .receiveBroadcastStream()
-        .map((dynamic result) =>
-            result is String ? [result] : List<String>.from(result))
+        .map((dynamic result) => List<String>.from(result))
         .map(parseConnectivityResults);
     return _onConnectivityChanged!;
   }