Merge branch 'master' into nnbd_update

Author: Emmanuel Garcia

packages/camera/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.5.8+11
+
+* Fix rare nullptr exception on Android.
+* Updated README.md with information about handling App lifecycle changes.
+
+## 0.5.8+10
+
+* Suppress the `deprecated_member_use` warning in the example app for `ScaffoldMessenger.showSnackBar`.
+
 ## 0.5.8+9
 
 * Update android compileSdkVersion to 29.

packages/camera/README.md

@@ -41,6 +41,27 @@ Change the minimum Android sdk version to 21 (or higher) in your `android/app/bu
 minSdkVersion 21
 ```
 
+### Handling Lifecycle states
+
+As of version [0.5.0](https://github.com/flutter/plugins/blob/master/packages/camera/CHANGELOG.md#050) of the camera plugin, lifecycle changes are no longer handled by the plugin. This means developers are now responsible to control camera resources when the lifecycle state is updated. Failure to do so might lead to unexpected behavior (for example as described in issue [#39109](https://github.com/flutter/flutter/issues/39109)). Handling lifecycle changes can be done by overriding the `didChangeAppLifecycleState` method like so:
+
+```dart
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    // App state changed before we got the chance to initialize.
+    if (controller == null || !controller.value.isInitialized) {
+      return;
+    }
+    if (state == AppLifecycleState.inactive) {
+      controller?.dispose();
+    } else if (state == AppLifecycleState.resumed) {
+      if (controller != null) {
+        onNewCameraSelected(controller.description);
+      }
+    }
+  }
+```
+
 ### Example
 
 Here is a small example flutter app displaying a full screen camera preview.

packages/camera/android/src/main/java/io/flutter/plugins/camera/Camera.java

@@ -410,6 +410,8 @@ public void resumeVideoRecording(@NonNull final Result result) {
   }
 
   public void startPreview() throws CameraAccessException {
+    if (pictureImageReader == null || pictureImageReader.getSurface() == null) return;
+
     createCaptureSession(CameraDevice.TEMPLATE_PREVIEW, pictureImageReader.getSurface());
   }
 

packages/camera/example/lib/main.dart

@@ -272,6 +272,7 @@ class _CameraExampleHomeState extends State<CameraExampleHome>
   String timestamp() => DateTime.now().millisecondsSinceEpoch.toString();
 
   void showInSnackBar(String message) {
+    // ignore: deprecated_member_use
     _scaffoldKey.currentState.showSnackBar(SnackBar(content: Text(message)));
   }
 

packages/camera/pubspec.yaml

@@ -2,7 +2,7 @@ name: camera
 description: A Flutter plugin for getting information about and controlling the
   camera on Android and iOS. Supports previewing the camera feed, capturing images, capturing video,
   and streaming image buffers to dart.
-version: 0.5.8+9
+version: 0.5.8+11
 
 homepage: https://github.com/flutter/plugins/tree/master/packages/camera
 

packages/connectivity/connectivity/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 2.0.0
+
+* [Breaking Change] The `getWifiName`, `getWifiBSSID` and `getWifiIP` are removed to [wifi_info_flutter](https://github.com/flutter/plugins/tree/master/packages/wifi_info_flutter)
+* Migration guide:
+
+  If you don't use any of the above APIs, your code should work as is. In addition, you can also remove `NSLocationAlwaysAndWhenInUseUsageDescription` and `NSLocationWhenInUseUsageDescription` in `ios/Runner/Info.plist`
+
+  If you use any of the above APIs, you can find the same APIs in the [wifi_info_flutter](https://github.com/flutter/plugins/tree/master/packages/wifi_info_flutter/wifi_info_flutter) plugin.
+  For example, to migrate `getWifiName`, use the new plugin:
+  ```dart
+  final WifiInfo _wifiInfo = WifiInfo();
+  final String wifiName = await _wifiInfo.getWifiName();
+  ```
+
+## 1.0.0
+
+* Mark wifi related code deprecated.
+* Announce 1.0.0!
+
 ## 0.4.9+5
 
 * Update android compileSdkVersion to 29.

packages/connectivity/connectivity/README.md

@@ -7,13 +7,6 @@ This plugin works for iOS and Android.
 > Note that on Android, this does not guarantee connection to Internet. For instance,
 the app might have wifi access but it might be a VPN or a hotel WiFi with no access.
 
-**Please set your constraint to `connectivity: '>=0.4.y+x <2.0.0'`**
-
-## Backward compatible 1.0.0 version is coming
-The plugin has reached a stable API, we guarantee that version `1.0.0` will be backward compatible with `0.4.y+z`.
-Please use `connectivity: '>=0.4.y+x <2.0.0'` as your dependency constraint to allow a smoother ecosystem migration.
-For more details see: https://github.com/flutter/flutter/wiki/Package-migration-to-1.0.0
-
 ## Usage
 
 Sample usage to check current status:
@@ -59,58 +52,6 @@ dispose() {
 
 Note that connectivity changes are no longer communicated to Android apps in the background starting with Android O. *You should always check for connectivity status when your app is resumed.* The broadcast is only useful when your application is in the foreground.
 
-To successfully get WiFi Name or Wi-Fi BSSID starting with Android O, ensure all of the following conditions are met:
-
- * If your app is targeting Android 10 (API level 29) SDK or higher, your app has the ACCESS_FINE_LOCATION permission.
- 
- * If your app is targeting SDK lower than Android 10 (API level 29), your app has the ACCESS_COARSE_LOCATION or ACCESS_FINE_LOCATION permission.
- 
- * Location services are enabled on the device (under Settings > Location).
- 
-You can get wi-fi related information using:
-
-```dart
-import 'package:connectivity/connectivity.dart';
-
-var wifiBSSID = await (Connectivity().getWifiBSSID());
-var wifiIP = await (Connectivity().getWifiIP());network
-var wifiName = await (Connectivity().getWifiName());wifi network
-```
-
-### iOS 12
-
-To use `.getWifiBSSID()` and `.getWifiName()` on iOS >= 12, the `Access WiFi information capability` in XCode must be enabled. Otherwise, both methods will return null.
-
-### iOS 13
-
-The methods `.getWifiBSSID()` and `.getWifiName()` utilize the [`CNCopyCurrentNetworkInfo`](https://developer.apple.com/documentation/systemconfiguration/1614126-cncopycurrentnetworkinfo) function on iOS.
-
-As of iOS 13, Apple announced that these APIs will no longer return valid information.
-An app linked against iOS 12 or earlier receives pseudo-values such as:
-
- * SSID: "Wi-Fi" or "WLAN" ("WLAN" will be returned for the China SKU).
-
- * BSSID: "00:00:00:00:00:00"
-
-An app linked against iOS 13 or later receives `null`.
-
-The `CNCopyCurrentNetworkInfo` will work for Apps that:
-
-  * The app uses Core Location, and has the user’s authorization to use location information.
-
-  * The app uses the NEHotspotConfiguration API to configure the current Wi-Fi network.
-
-  * The app has active VPN configurations installed.
-
-If your app falls into the last two categories, it will work as it is. If your app doesn't fall into the last two categories,
-and you still need to access the wifi information, you should request user's authorization to use location information.
-
-There is a helper method provided in this plugin to request the location authorization: `requestLocationServiceAuthorization`.
-To request location authorization, make sure to add the following keys to your _Info.plist_ file, located in `<project root>/ios/Runner/Info.plist`:
-
-* `NSLocationAlwaysAndWhenInUseUsageDescription` - describe why the app needs access to the user’s location information all the time (foreground and background). This is called _Privacy - Location Always and When In Use Usage Description_ in the visual editor.
-* `NSLocationWhenInUseUsageDescription` - describe why the app needs access to the user’s location information when the app is running in the foreground. This is called _Privacy - Location When In Use Usage Description_ in the visual editor.
-
 ## Getting Started
 
 For help getting started with Flutter, view our online

packages/connectivity/connectivity/android/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="io.flutter.plugins.connectivity">
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
 </manifest>

packages/connectivity/connectivity/android/src/main/java/io/flutter/plugins/connectivity/Connectivity.java

@@ -7,18 +7,14 @@
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkCapabilities;
-import android.net.wifi.WifiInfo;
-import android.net.wifi.WifiManager;
 import android.os.Build;
 
 /** Reports connectivity related information such as connectivity type and wifi information. */
 class Connectivity {
   private ConnectivityManager connectivityManager;
-  private WifiManager wifiManager;
 
-  Connectivity(ConnectivityManager connectivityManager, WifiManager wifiManager) {
+  Connectivity(ConnectivityManager connectivityManager) {
     this.connectivityManager = connectivityManager;
-    this.wifiManager = wifiManager;
   }
 
   String getNetworkType() {
@@ -40,44 +36,6 @@ String getNetworkType() {
     return getNetworkTypeLegacy();
   }
 
-  String getWifiName() {
-    WifiInfo wifiInfo = getWifiInfo();
-    String ssid = null;
-    if (wifiInfo != null) ssid = wifiInfo.getSSID();
-    if (ssid != null) ssid = ssid.replaceAll("\"", ""); // Android returns "SSID"
-    return ssid;
-  }
-
-  String getWifiBSSID() {
-    WifiInfo wifiInfo = getWifiInfo();
-    String bssid = null;
-    if (wifiInfo != null) {
-      bssid = wifiInfo.getBSSID();
-    }
-    return bssid;
-  }
-
-  String getWifiIPAddress() {
-    WifiInfo wifiInfo = null;
-    if (wifiManager != null) wifiInfo = wifiManager.getConnectionInfo();
-
-    String ip = null;
-    int i_ip = 0;
-    if (wifiInfo != null) i_ip = wifiInfo.getIpAddress();
-
-    if (i_ip != 0)
-      ip =
-          String.format(
-              "%d.%d.%d.%d",
-              (i_ip & 0xff), (i_ip >> 8 & 0xff), (i_ip >> 16 & 0xff), (i_ip >> 24 & 0xff));
-
-    return ip;
-  }
-
-  private WifiInfo getWifiInfo() {
-    return wifiManager == null ? null : wifiManager.getConnectionInfo();
-  }
-
   @SuppressWarnings("deprecation")
   private String getNetworkTypeLegacy() {
     // handle type for Android versions less than Android 9

packages/connectivity/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityMethodChannelHandler.java

@@ -31,15 +31,6 @@ public void onMethodCall(MethodCall call, MethodChannel.Result result) {
       case "check":
         result.success(connectivity.getNetworkType());
         break;
-      case "wifiName":
-        result.success(connectivity.getWifiName());
-        break;
-      case "wifiBSSID":
-        result.success(connectivity.getWifiBSSID());
-        break;
-      case "wifiIPAddress":
-        result.success(connectivity.getWifiIPAddress());
-        break;
       default:
         result.notImplemented();
         break;

packages/connectivity/connectivity/android/src/main/java/io/flutter/plugins/connectivity/ConnectivityPlugin.java

@@ -6,7 +6,6 @@
 
 import android.content.Context;
 import android.net.ConnectivityManager;
-import android.net.wifi.WifiManager;
 import io.flutter.embedding.engine.plugins.FlutterPlugin;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.EventChannel;
@@ -41,10 +40,8 @@ private void setupChannels(BinaryMessenger messenger, Context context) {
     eventChannel = new EventChannel(messenger, "plugins.flutter.io/connectivity_status");
     ConnectivityManager connectivityManager =
         (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
-    WifiManager wifiManager =
-        (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
 
-    Connectivity connectivity = new Connectivity(connectivityManager, wifiManager);
+    Connectivity connectivity = new Connectivity(connectivityManager);
 
     ConnectivityMethodChannelHandler methodChannelHandler =
         new ConnectivityMethodChannelHandler(connectivity);