packages/connectivity_plus/connectivity_plus/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 6.0.3
+
+ - **FIX**(connectivity_plus): Ensure Connectivity on Android is correctly reported when lost ([#2836](https://github.com/fluttercommunity/plus_plugins/issues/2836)). ([2aa6ad7a](https://github.com/fluttercommunity/plus_plugins/commit/2aa6ad7a1c05d35b894e6cef515bd9dfa49351dd))
+
 ## 6.0.2
 
  - **REFACTOR**(connectivity_plus): remove ReachabilityConnectivityProvider and ReachabilitySwift dependency ([#2813](https://github.com/fluttercommunity/plus_plugins/issues/2813)). ([f9ad927f](https://github.com/fluttercommunity/plus_plugins/commit/f9ad927f5c18f8ed8d4c22a24476430239c13492))

packages/connectivity_plus/connectivity_plus/README.md

@@ -58,7 +58,9 @@ if (connectivityResult.contains(ConnectivityResult.mobile)) {
 ```
 
 You can also listen for active connectivity types changes by subscribing to the stream
-exposed by the plugin:
+exposed by the plugin.
+
+This method should ensure emitting only distinct values.
 
 ```dart
 import 'package:connectivity_plus/connectivity_plus.dart';

packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/Connectivity.java

@@ -8,6 +8,8 @@
 import android.net.Network;
 import android.net.NetworkCapabilities;
 import android.os.Build;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,44 +29,54 @@ public Connectivity(ConnectivityManager connectivityManager) {
   }
 
   List<String> getNetworkTypes() {
-    List<String> types = new ArrayList<>();
     if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
       Network network = connectivityManager.getActiveNetwork();
-      NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(network);
-      if (capabilities == null
-          || !capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
-        types.add(CONNECTIVITY_NONE);
-        return types;
-      }
-      if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
-          || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI_AWARE)) {
-        types.add(CONNECTIVITY_WIFI);
-      }
-      if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)) {
-        types.add(CONNECTIVITY_ETHERNET);
-      }
-      if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
-        types.add(CONNECTIVITY_VPN);
-      }
-      if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
-        types.add(CONNECTIVITY_MOBILE);
-      }
-      if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH)) {
-        types.add(CONNECTIVITY_BLUETOOTH);
-      }
-      if (types.isEmpty()
-          && capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
-        types.add(CONNECTIVITY_OTHER);
-      }
-      if (types.isEmpty()) {
-        types.add(CONNECTIVITY_NONE);
-      }
+      return getCapabilitiesFromNetwork(network);
     } else {
       // For legacy versions, return a single type as before or adapt similarly if multiple types
       // need to be supported
       return getNetworkTypesLegacy();
     }
+  }
 
+  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+  List<String> getCapabilitiesFromNetwork(Network network) {
+    NetworkCapabilities capabilities = connectivityManager.getNetworkCapabilities(network);
+    return getCapabilitiesList(capabilities);
+  }
+
+  @NonNull
+  @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+  List<String> getCapabilitiesList(NetworkCapabilities capabilities) {
+    List<String> types = new ArrayList<>();
+    if (capabilities == null
+        || !capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
+      types.add(CONNECTIVITY_NONE);
+      return types;
+    }
+    if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI)
+        || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI_AWARE)) {
+      types.add(CONNECTIVITY_WIFI);
+    }
+    if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)) {
+      types.add(CONNECTIVITY_ETHERNET);
+    }
+    if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
+      types.add(CONNECTIVITY_VPN);
+    }
+    if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR)) {
+      types.add(CONNECTIVITY_MOBILE);
+    }
+    if (capabilities.hasTransport(NetworkCapabilities.TRANSPORT_BLUETOOTH)) {
+      types.add(CONNECTIVITY_BLUETOOTH);
+    }
+    if (types.isEmpty()
+        && capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)) {
+      types.add(CONNECTIVITY_OTHER);
+    }
+    if (types.isEmpty()) {
+      types.add(CONNECTIVITY_NONE);
+    }
     return types;
   }
 

packages/connectivity_plus/connectivity_plus/android/src/main/java/dev/fluttercommunity/plus/connectivity/ConnectivityBroadcastReceiver.java

@@ -15,6 +15,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import io.flutter.plugin.common.EventChannel;
+import java.util.List;
 
 /**
  * The ConnectivityBroadcastReceiver receives the connectivity updates and send them to the UIThread
@@ -46,18 +47,31 @@ public void onListen(Object arguments, EventChannel.EventSink events) {
           new ConnectivityManager.NetworkCallback() {
             @Override
             public void onAvailable(Network network) {
-              sendEvent();
+              // onAvailable is called when the phone switches to a new network
+              // e.g. the phone was offline and gets wifi connection
+              // or the phone was on wifi and now switches to mobile.
+              // The plugin sends the current capability connection to the users.
+              sendEvent(connectivity.getCapabilitiesFromNetwork(network));
             }
 
             @Override
             public void onCapabilitiesChanged(
                 Network network, NetworkCapabilities networkCapabilities) {
-              sendEvent();
+              // This callback is called multiple times after a call to onAvailable
+              // this also causes multiple callbacks to the Flutter layer.
+              sendEvent(connectivity.getCapabilitiesList(networkCapabilities));
             }
 
             @Override
             public void onLost(Network network) {
-              sendEvent();
+              // This callback is called when a capability is lost.
+              //
+              // The provided Network object contains information about the
+              // network capability that has been lost, so we cannot use it.
+              //
+              // Instead, post the current network but with a delay long enough
+              // that we avoid a race condition.
+              sendCurrentStatusWithDelay();
             }
           };
       connectivity.getConnectivityManager().registerDefaultNetworkCallback(networkCallback);
@@ -66,7 +80,7 @@ public void onLost(Network network) {
     }
     // Need to emit first event with connectivity types without waiting for first change in system
     // that might happen much later
-    sendEvent();
+    sendEvent(connectivity.getNetworkTypes());
   }
 
   @Override
@@ -92,11 +106,16 @@ public void onReceive(Context context, Intent intent) {
     }
   }
 
-  private void sendEvent() {
+  private void sendEvent(List<String> networkTypes) {
+    Runnable runnable = () -> events.success(networkTypes);
+    // Emit events on main thread
+    mainHandler.post(runnable);
+  }
+
+  private void sendCurrentStatusWithDelay() {
     Runnable runnable = () -> events.success(connectivity.getNetworkTypes());
-    // 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);
+    // Emit events on main thread
+    // 500 milliseconds to avoid race conditions
+    mainHandler.postDelayed(runnable, 500);
   }
 }

packages/connectivity_plus/connectivity_plus/example/lib/main.dart

@@ -86,6 +86,8 @@ class _MyHomePageState extends State<MyHomePage> {
     setState(() {
       _connectionStatus = result;
     });
+    // ignore: avoid_print
+    print('Connectivity changed: $_connectionStatus');
   }
 
   @override

packages/connectivity_plus/connectivity_plus/example/pubspec.yaml

@@ -7,7 +7,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  connectivity_plus: ^6.0.2
+  connectivity_plus: ^6.0.3
 
 dev_dependencies:
   flutter_driver:

packages/connectivity_plus/connectivity_plus/lib/connectivity_plus.dart

@@ -5,6 +5,7 @@
 import 'dart:async';
 
 import 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart';
+import 'package:collection/collection.dart';
 
 // Export enums from the platform_interface so plugin users can use them directly.
 export 'package:connectivity_plus_platform_interface/connectivity_plus_platform_interface.dart'
@@ -40,16 +41,14 @@ class Connectivity {
   /// status changes, this is a known issue that only affects simulators.
   /// For details see https://github.com/fluttercommunity/plus_plugins/issues/479.
   ///
-  /// On Android, the Stream may emit new values even when
-  /// the [ConnectivityResult] list remains the same.
-  ///
   /// The emitted list is never empty. In case of no connectivity, the list contains
   /// a single element of [ConnectivityResult.none]. Note also that this is the only
   /// case where [ConnectivityResult.none] is present.
   ///
-  /// This method doesn't filter events, nor it ensures distinct values.
+  /// This method applies [Stream.distinct] over the received events to ensure
+  /// only emiting when connectivity changes.
   Stream<List<ConnectivityResult>> get onConnectivityChanged {
-    return _platform.onConnectivityChanged;
+    return _platform.onConnectivityChanged.distinct((a, b) => a.equals(b));
   }
 
   /// Checks the connection status of the device.

packages/connectivity_plus/connectivity_plus/pubspec.yaml

@@ -1,6 +1,6 @@
 name: connectivity_plus
 description: Flutter plugin for discovering the state of the network (WiFi & mobile/cellular) connectivity on Android and iOS.
-version: 6.0.2
+version: 6.0.3
 homepage: https://plus.fluttercommunity.dev/
 repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/connectivity_plus/connectivity_plus
 issue_tracker: https://github.com/fluttercommunity/plus_plugins/labels/connectivity_plus
@@ -41,6 +41,7 @@ dependencies:
   web: '>=0.3.0 <=0.6.0'
   meta: ^1.8.0
   nm: ^0.5.0
+  collection: ^1.18.0
 
 dev_dependencies:
   flutter_test:

packages/package_info_plus/package_info_plus/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 8.0.0
+
+> Note: This release has breaking changes.
+
+ - **DOCS**(package_info_plus): Add platform specific documentation ([#2845](https://github.com/fluttercommunity/plus_plugins/issues/2845)). ([ad06a236](https://github.com/fluttercommunity/plus_plugins/commit/ad06a236d7647e958f4b25cd9ee8fe68f4c4faf3))
+ - **DOCS**(package_info_plus): Improve web documentation re. CORS ([#2841](https://github.com/fluttercommunity/plus_plugins/issues/2841)). ([7d712ef8](https://github.com/fluttercommunity/plus_plugins/commit/7d712ef816808d533b2fd0b4f8c9f11ebb23ab53))
+ - **BREAKING** **FEAT**(package_info_plus): Switch to SHA-256 for `buildSignature` on Android ([#2835](https://github.com/fluttercommunity/plus_plugins/issues/2835)). ([7259af20](https://github.com/fluttercommunity/plus_plugins/commit/7259af200810bd717d95688fbcdca67a028f9cd0))
+
 ## 7.0.0
 
 > Note: This release has breaking changes.

packages/package_info_plus/package_info_plus/README.md

@@ -71,6 +71,26 @@ See https://github.com/fluttercommunity/plus_plugins/issues/309
 There was an [issue](https://github.com/flutter/flutter/issues/73652) in Flutter, which is already resolved since Flutter 3.3.
 If your project was created before Flutter 3.3 you need to migrate the project according to [this guide] (https://docs.flutter.dev/release/breaking-changes/windows-version-information) first to get correct version with `package_info_plus`
 
+### Web
+
+In a web environment, the package uses the `version.json` file that it is generated in the build process.
+
+#### Accessing the `version.json`
+
+The package tries to locate the `version.json` using three methods:
+
+1. Using the provided `baseUrl` in the `fromPlatform()` method.
+2. Checking the configured `assets` folder in the Flutter web configuration.
+3. Checking the path where the application is installed.
+
+See the documentation at the method `fromPlatform()` to learn more.
+
+#### CORS `version.json` access
+
+It could be possible that the plugin cannot access the `version.json` file because the server is preventing it.
+This can be due a CORS issue, and it is known to happen when hosting the Flutter code on Firebase Hosting.
+Ensure that your CORS Firebase configuration allows it.
+
 ## Learn more
 
 - [API Documentation](https://pub.dev/documentation/package_info_plus/latest/package_info_plus/package_info_plus-library.html)

packages/package_info_plus/package_info_plus/android/src/main/kotlin/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.kt

@@ -94,9 +94,9 @@ class PackageInfoPlugin : MethodCallHandler, FlutterPlugin {
                 val signingInfo = packageInfo.signingInfo ?: return null
 
                 if (signingInfo.hasMultipleSigners()) {
-                    signatureToSha1(signingInfo.apkContentsSigners.first().toByteArray())
+                    signatureToSha256(signingInfo.apkContentsSigners.first().toByteArray())
                 } else {
-                    signatureToSha1(signingInfo.signingCertificateHistory.first().toByteArray())
+                    signatureToSha256(signingInfo.signingCertificateHistory.first().toByteArray())
                 }
             } else {
                 val packageInfo = pm.getPackageInfo(
@@ -108,7 +108,7 @@ class PackageInfoPlugin : MethodCallHandler, FlutterPlugin {
                 if (signatures.isNullOrEmpty() || packageInfo.signatures.first() == null) {
                     null
                 } else {
-                    signatureToSha1(signatures.first().toByteArray())
+                    signatureToSha256(signatures.first().toByteArray())
                 }
             }
         } catch (e: PackageManager.NameNotFoundException) {
@@ -120,8 +120,8 @@ class PackageInfoPlugin : MethodCallHandler, FlutterPlugin {
 
     // Credits https://gist.github.com/scottyab/b849701972d57cf9562e
     @Throws(NoSuchAlgorithmException::class)
-    private fun signatureToSha1(sig: ByteArray): String {
-        val digest = MessageDigest.getInstance("SHA1")
+    private fun signatureToSha256(sig: ByteArray): String {
+        val digest = MessageDigest.getInstance("SHA-256")
         digest.update(sig)
         val hashText = digest.digest()
         return bytesToHex(hashText)

packages/package_info_plus/package_info_plus/example/pubspec.yaml

@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
   http: ">=0.13.5 <2.0.0"
-  package_info_plus: ^7.0.0
+  package_info_plus: ^8.0.0
 
 dev_dependencies:
   build_runner: ^2.3.3

packages/package_info_plus/package_info_plus/lib/package_info_plus.dart

@@ -92,21 +92,56 @@ class PackageInfo {
     return _fromPlatform!;
   }
 
-  /// The app name. `CFBundleDisplayName` on iOS, `application/label` on Android.
+  /// The app name.
+  ///
+  /// - `CFBundleDisplayName` on iOS and macOS, falls back to `CFBundleName`.
+  ///   Defined in the `info.plist` and/or product target in xcode.
+  /// - `application/label` on Android.
+  ///   Defined in `AndroidManifest.xml` or String resources.
+  /// - `app_name` from `version.json` on Web.
+  ///   Defined in the `manifest.json`.
+  /// - `app_name` from `version.json` on Linux.
+  ///   Defined in the `CMakeLists.txt` file.
+  /// - `ProductName` from the compiled executable file on Windows.
+  ///    Defined in the `Runner.rc` file.
   final String appName;
 
-  /// The package name. `bundleIdentifier` on iOS, `getPackageName` on Android.
+  /// The package name.
+  ///
+  /// - `bundleIdentifier` on iOS and macOS.
+  ///   Defined in the product target in xcode.
+  /// - `packageName` on Android.
+  ///   Defined in `build.gradle` as `applicationId`.
+  /// - `package_name` from `version.json` on Web and Linux
+  ///   Generated by Flutter.
+  /// - `InternalName` from the compiled executable file on Windows.
+  ///   Defined in the `Runner.rc` file.
   final String packageName;
 
-  /// The package version. `CFBundleShortVersionString` on iOS, `versionName` on Android.
+  /// The package version.
+  /// Generated from the version in `pubspec.yaml`.
+  ///
+  /// - `CFBundleShortVersionString` on iOS and macOS.
+  /// - `versionName` on Android.
+  /// - `version` from `version.json` on Web and Linux.
+  /// - `ProductVersion` from the compiled executable file on Windows.
   final String version;
 
-  /// The build number. `CFBundleVersion` on iOS, `versionCode` on Android.
+  /// The build number.
+  /// Generated from the version in `pubspec.yaml`.
+  ///
+  /// - `CFBundleVersion` on iOS and macOs.
+  /// - `versionCode` on Android.
+  /// - `build_number` from `version.json` on Web and Linux.
+  /// - `ProductVersion` from the compiled executable file on Windows.
+  ///
   /// Note, on iOS if an app has no buildNumber specified this property will return version
   /// Docs about CFBundleVersion: https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleversion
   final String buildNumber;
 
-  /// The build signature. Empty string on iOS, signing key signature (hex) on Android.
+  /// The build signature.
+  /// SHA-256 signing key signature (hex) on Android.
+  /// Empty string on all the other platforms.
   final String buildSignature;
 
   /// The installer store. Indicates through which store this application was installed.

packages/package_info_plus/package_info_plus/pubspec.yaml

@@ -1,6 +1,6 @@
 name: package_info_plus
 description: Flutter plugin for querying information about the application package, such as CFBundleVersion on iOS or versionCode on Android.
-version: 7.0.0
+version: 8.0.0
 homepage: https://plus.fluttercommunity.dev/
 repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/package_info_plus/package_info_plus
 issue_tracker: https://github.com/fluttercommunity/plus_plugins/labels/package_info_plus