[image_picker] add requestFullMetadata for iOS (optional permissions)

packages/image_picker/image_picker/CHANGELOG.md

@@ -1,7 +1,7 @@
-## NEXT
-
+## 0.8.5
 * Updates Android compileSdkVersion to 31.
 * Fix iOS RunnerUITests search paths.
+* Adds `requestFullMetadata` option to `pickImage`, so images on iOS can be picked without `Photo Library Usage` permission.
 
 ## 0.8.4+4
 

packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m

@@ -97,7 +97,12 @@ - (void)pickImageWithPHPicker:(int)maxImagesAllowed API_AVAILABLE(ios(14)) {
 
   self.maxImagesAllowed = maxImagesAllowed;
 
-  [self checkPhotoAuthorizationForAccessLevel];
+  BOOL usePhaAsset = [[_arguments objectForKey:@"requestFullMetadata"] boolValue];
+  if (usePhaAsset) {
+    [self checkPhotoAuthorizationForAccessLevel];
+  } else {
+    [self showPhotoLibrary:PHPickerClassType];
+  }
 }
 
 - (void)pickImageWithUIImagePicker {
@@ -107,6 +112,7 @@ - (void)pickImageWithUIImagePicker {
   _imagePickerController.mediaTypes = @[ (NSString *)kUTTypeImage ];
 
   int imageSource = [[_arguments objectForKey:@"source"] intValue];
+  BOOL usePhaAsset = [[_arguments objectForKey:@"requestFullMetadata"] boolValue];
 
   self.maxImagesAllowed = 1;
 
@@ -115,7 +121,11 @@ - (void)pickImageWithUIImagePicker {
       [self checkCameraAuthorization];
       break;
     case SOURCE_GALLERY:
-      [self checkPhotoAuthorization];
+      if (usePhaAsset) {
+        [self checkPhotoAuthorization];
+      } else {
+        [self showPhotoLibrary:UIImagePickerClassType];
+      }
       break;
     default:
       self.result([FlutterError errorWithCode:@"invalid_source"
@@ -132,13 +142,14 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
                                     details:nil]);
     self.result = nil;
   }
+  BOOL usePhaAsset = [[_arguments objectForKey:@"requestFullMetadata"] boolValue];
 
   if ([@"pickImage" isEqualToString:call.method]) {
     self.result = result;
     _arguments = call.arguments;
     int imageSource = [[_arguments objectForKey:@"source"] intValue];
 
-    if (imageSource == SOURCE_GALLERY) {  // Capture is not possible with PHPicker
+    if (usePhaAsset && imageSource == SOURCE_GALLERY) {  // Capture is not possible with PHPicker
       if (@available(iOS 14, *)) {
         // PHPicker is used
         [self pickImageWithPHPicker:1];
@@ -181,6 +192,11 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
         [self checkCameraAuthorization];
         break;
       case SOURCE_GALLERY:
+        if (usePhaAsset) {
+          [self checkPhotoAuthorization];
+        } else {
+          [self showPhotoLibrary:UIImagePickerClassType];
+        }
         [self checkPhotoAuthorization];
         break;
       default:
@@ -484,8 +500,12 @@ - (void)imagePickerController:(UIImagePickerController *)picker
     NSNumber *maxHeight = [_arguments objectForKey:@"maxHeight"];
     NSNumber *imageQuality = [_arguments objectForKey:@"imageQuality"];
     NSNumber *desiredImageQuality = [self getDesiredImageQuality:imageQuality];
+    BOOL usePhaAsset = [[_arguments objectForKey:@"requestFullMetadata"] boolValue];
 
-    PHAsset *originalAsset = [FLTImagePickerPhotoAssetUtil getAssetFromImagePickerInfo:info];
+    PHAsset *originalAsset;
+    if (usePhaAsset) {
+      originalAsset = [FLTImagePickerPhotoAssetUtil getAssetFromImagePickerInfo:info];
+    }
 
     if (maxWidth != (id)[NSNull null] || maxHeight != (id)[NSNull null]) {
       image = [FLTImagePickerImageUtil scaledImage:image

packages/image_picker/image_picker/lib/image_picker.dart

@@ -191,6 +191,10 @@ class ImagePicker {
   /// the front or rear camera should be opened, this function is not guaranteed
   /// to work on an Android device.
   ///
+  /// Use `requestFullMetadata` (defaults to `true`) to control how much additional information the plugin tries to get on iOS.
+  /// If `requestFullMetadata` is set to `true`, the plugin tries to get the full image metadata which may require
+  /// extra permission requests on some platforms, such as `Photo Library Usage` permission on iOS .
+  ///
   /// In Android, the MainActivity can be destroyed for various reasons. If that happens, the result will be lost
   /// in this call. You can then call [retrieveLostData] when your app relaunches to retrieve the lost data.
   ///
@@ -206,13 +210,15 @@ class ImagePicker {
     double? maxHeight,
     int? imageQuality,
     CameraDevice preferredCameraDevice = CameraDevice.rear,
+    bool requestFullMetadata = true,
   }) {
-    return platform.getImage(
+    return platform.getImageFromSource(
       source: source,
       maxWidth: maxWidth,
       maxHeight: maxHeight,
       imageQuality: imageQuality,
       preferredCameraDevice: preferredCameraDevice,
+      requestFullMetadata: requestFullMetadata,
     );
   }
 

packages/image_picker/image_picker/pubspec.yaml

@@ -3,7 +3,7 @@ description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 repository: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
-version: 0.8.4+4
+version: 0.8.5
 
 environment:
   sdk: ">=2.14.0 <3.0.0"
@@ -33,3 +33,9 @@ dev_dependencies:
   mockito: ^5.0.0
   pedantic: ^1.10.0
   plugin_platform_interface: ^2.0.0
+
+# FOR TESTING ONLY. DO NOT MERGE.
+dependency_overrides:
+  image_picker_platform_interface:
+    path:
+      ../image_picker_platform_interface

packages/image_picker/image_picker/test/image_picker_deprecated_test.dart

@@ -57,14 +57,16 @@ void main() {
                 'maxWidth': null,
                 'maxHeight': null,
                 'imageQuality': null,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
               isMethodCall('pickImage', arguments: <String, dynamic>{
                 'source': 1,
                 'maxWidth': null,
                 'maxHeight': null,
                 'imageQuality': null,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
             ],
           );
@@ -103,49 +105,56 @@ void main() {
                 'maxWidth': null,
                 'maxHeight': null,
                 'imageQuality': null,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
               isMethodCall('pickImage', arguments: <String, dynamic>{
                 'source': 0,
                 'maxWidth': 10.0,
                 'maxHeight': null,
                 'imageQuality': null,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
               isMethodCall('pickImage', arguments: <String, dynamic>{
                 'source': 0,
                 'maxWidth': null,
                 'maxHeight': 10.0,
                 'imageQuality': null,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
               isMethodCall('pickImage', arguments: <String, dynamic>{
                 'source': 0,
                 'maxWidth': 10.0,
                 'maxHeight': 20.0,
                 'imageQuality': null,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
               isMethodCall('pickImage', arguments: <String, dynamic>{
                 'source': 0,
                 'maxWidth': 10.0,
                 'maxHeight': null,
                 'imageQuality': 70,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
               isMethodCall('pickImage', arguments: <String, dynamic>{
                 'source': 0,
                 'maxWidth': null,
                 'maxHeight': 10.0,
                 'imageQuality': 70,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
               isMethodCall('pickImage', arguments: <String, dynamic>{
                 'source': 0,
                 'maxWidth': 10.0,
                 'maxHeight': 20.0,
                 'imageQuality': 70,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
             ],
           );
@@ -182,6 +191,7 @@ void main() {
                 'maxHeight': null,
                 'imageQuality': null,
                 'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
             ],
           );
@@ -201,6 +211,7 @@ void main() {
                 'maxHeight': null,
                 'imageQuality': null,
                 'cameraDevice': 1,
+                'requestFullMetadata': true,
               }),
             ],
           );

packages/image_picker/image_picker/test/image_picker_test.dart

@@ -52,14 +52,16 @@ void main() {
                 'maxWidth': null,
                 'maxHeight': null,
                 'imageQuality': null,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
               isMethodCall('pickImage', arguments: <String, dynamic>{
                 'source': 1,
                 'maxWidth': null,
                 'maxHeight': null,
                 'imageQuality': null,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
             ],
           );
@@ -98,49 +100,56 @@ void main() {
                 'maxWidth': null,
                 'maxHeight': null,
                 'imageQuality': null,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
               isMethodCall('pickImage', arguments: <String, dynamic>{
                 'source': 0,
                 'maxWidth': 10.0,
                 'maxHeight': null,
                 'imageQuality': null,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
               isMethodCall('pickImage', arguments: <String, dynamic>{
                 'source': 0,
                 'maxWidth': null,
                 'maxHeight': 10.0,
                 'imageQuality': null,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
               isMethodCall('pickImage', arguments: <String, dynamic>{
                 'source': 0,
                 'maxWidth': 10.0,
                 'maxHeight': 20.0,
                 'imageQuality': null,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
               isMethodCall('pickImage', arguments: <String, dynamic>{
                 'source': 0,
                 'maxWidth': 10.0,
                 'maxHeight': null,
                 'imageQuality': 70,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
               isMethodCall('pickImage', arguments: <String, dynamic>{
                 'source': 0,
                 'maxWidth': null,
                 'maxHeight': 10.0,
                 'imageQuality': 70,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
               isMethodCall('pickImage', arguments: <String, dynamic>{
                 'source': 0,
                 'maxWidth': 10.0,
                 'maxHeight': 20.0,
                 'imageQuality': 70,
-                'cameraDevice': 0
+                'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
             ],
           );
@@ -177,6 +186,7 @@ void main() {
                 'maxHeight': null,
                 'imageQuality': null,
                 'cameraDevice': 0,
+                'requestFullMetadata': true,
               }),
             ],
           );
@@ -196,6 +206,26 @@ void main() {
                 'maxHeight': null,
                 'imageQuality': null,
                 'cameraDevice': 1,
+                'requestFullMetadata': true,
+              }),
+            ],
+          );
+        });
+
+        test('passes the full metadata argument correctly', () async {
+          await picker.pickImage(
+              source: ImageSource.camera, requestFullMetadata: false);
+
+          expect(
+            log,
+            <Matcher>[
+              isMethodCall('pickImage', arguments: <String, dynamic>{
+                'source': 0,
+                'maxWidth': null,
+                'maxHeight': null,
+                'imageQuality': null,
+                'cameraDevice': 0,
+                'requestFullMetadata': false,
               }),
             ],
           );

packages/image_picker/image_picker_platform_interface/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.5.0
+
+* Re-adds `requestFullMetadata` option, but as a parameter of a new `pickImageFromSource` 
+  method.
+
 ## 2.4.3
 
 * Removes dependency on `meta`.
@@ -13,10 +18,10 @@
 
 ## 2.4.0
 
-* Add `forceFullMetadata` option to `pickImage`.
-  * To keep this non-breaking `forceFullMetadata` defaults to `true`, so the plugin tries
+* Add `requestFullMetadata` option to `pickImage`.
+  * To keep this non-breaking `requestFullMetadata` defaults to `true`, so the plugin tries
    to get the full image metadata which may require extra permission requests on certain platforms.
-  * If `forceFullMetadata` is set to `false`, the plugin fetches the image in a way that reduces
+  * If `requestFullMetadata` is set to `false`, the plugin fetches the image in a way that reduces
    permission requests from the platform (e.g on iOS the plugin won’t ask for the `NSPhotoLibraryUsageDescription` permission).
 
 ## 2.3.0