[image_picker] Default to gallery instead of camera when picking multiple images on pre-iOS 14 devices.

packages/image_picker/image_picker/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.8.4+8
+
+* Ensures the `result` callback and method call `arguments` send to iOS are 
+taken into consideration when picking multiple images on pre-iOS 14 devices;
+* Configures the `UIImagePicker` to default to gallery instead of camera when
+picking multiple images on pre-iOS 14 devices.
+
 ## 0.8.4+7
 
 * Refactors unit test to expose private interface via a separate test header instead of the inline declaration.

packages/image_picker/image_picker/example/ios/RunnerTests/ImagePickerPluginTests.m

@@ -146,6 +146,32 @@ - (void)testPluginPickVideoDeviceFront {
                  UIImagePickerControllerCameraDeviceFront);
 }
 
+- (void)testPickMultiImageShouldUseUIImagePickerControllerOnPreiOS14 {
+  if (@available(iOS 14, *)) {
+    return;
+  }
+
+  id photoLibrary = OCMClassMock([PHPhotoLibrary class]);
+  OCMStub(ClassMethod([photoLibrary authorizationStatus]))
+      .andReturn(PHAuthorizationStatusAuthorized);
+
+  FLTImagePickerPlugin *plugin = [FLTImagePickerPlugin new];
+  [plugin setImagePickerControllerOverride:_mockUIImagePicker];
+  FlutterMethodCall *call = [FlutterMethodCall methodCallWithMethodName:@"pickMultiImage"
+                                                              arguments:@{
+                                                                @"maxWidth" : @(100),
+                                                                @"maxHeight" : @(200),
+                                                                @"imageQuality" : @(50),
+                                                              }];
+
+  [plugin handleMethodCall:call
+                    result:^(id _Nullable r){
+                    }];
+
+  OCMVerify(times(1),
+            [self->_mockUIImagePicker setSourceType:UIImagePickerControllerSourceTypePhotoLibrary]);
+}
+
 #pragma mark - Test camera devices, no op on simulators
 
 - (void)testPluginPickImageDeviceCancelClickMultipleTimes {

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

@@ -33,8 +33,6 @@ @interface FLTImagePickerPlugin () <UINavigationControllerDelegate,
 
 @property(assign, nonatomic) int maxImagesAllowed;
 
-@property(copy, nonatomic) NSDictionary *arguments;
-
 @property(strong, nonatomic) PHPickerViewController *pickerViewController API_AVAILABLE(ios(14));
 
 @end
@@ -45,6 +43,8 @@ @interface FLTImagePickerPlugin () <UINavigationControllerDelegate,
 typedef NS_ENUM(NSInteger, ImagePickerClassType) { UIImagePickerClassType, PHPickerClassType };
 
 @implementation FLTImagePickerPlugin {
+  NSDictionary *_arguments;
+  UIImagePickerController *_imagePickerControllerOverride;
   UIImagePickerController *_imagePickerController;
 }
 
@@ -56,10 +56,32 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
   [registrar addMethodCallDelegate:instance channel:channel];
 }
 
+/**
+ * Initializes the _imagePickerController member with a new instance of the
+ * UIImagePickerController class.
+ *
+ * A new instance of the UIImagePickerController is created every time the
+ * initImagePickerController method is called. For testing purposes this can
+ * be overriden using the setImagePickerControllerOverride method, in which
+ * case the set instance of the UIImagePickerController is used to initialize
+ * the _imagePickerController member.
+ */
+- (void)initImagePickerController {
+  if (_imagePickerControllerOverride) {
+    _imagePickerController = _imagePickerControllerOverride;
+  } else {
+    _imagePickerController = [[UIImagePickerController alloc] init];
+  }
+}
+
 - (UIImagePickerController *)getImagePickerController {
   return _imagePickerController;
 }
 
+- (void)setImagePickerControllerOverride:(UIImagePickerController *)imagePickerController {
+  _imagePickerControllerOverride = imagePickerController;
+}
+
 - (UIViewController *)viewControllerWithWindow:(UIWindow *)window {
   UIWindow *windowToUse = window;
   if (windowToUse == nil) {
@@ -108,14 +130,12 @@ - (void)pickImageWithPHPicker:(int)maxImagesAllowed API_AVAILABLE(ios(14)) {
   [self checkPhotoAuthorizationForAccessLevel];
 }
 
-- (void)pickImageWithUIImagePicker {
-  _imagePickerController = [[UIImagePickerController alloc] init];
+- (void)launchUIImagePickerWithSource:(int)imageSource {
+  [self initImagePickerController];
   _imagePickerController.modalPresentationStyle = UIModalPresentationCurrentContext;
   _imagePickerController.delegate = self;
   _imagePickerController.mediaTypes = @[ (NSString *)kUTTypeImage ];
 
-  int imageSource = [[_arguments objectForKey:@"source"] intValue];
-
   self.maxImagesAllowed = 1;
 
   switch (imageSource) {
@@ -141,32 +161,31 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     self.result = nil;
   }
 
+  self.result = result;
+  _arguments = call.arguments;
+
   if ([@"pickImage" isEqualToString:call.method]) {
-    self.result = result;
-    _arguments = call.arguments;
-    int imageSource = [[_arguments objectForKey:@"source"] intValue];
+    int imageSource = [[call.arguments objectForKey:@"source"] intValue];
 
     if (imageSource == SOURCE_GALLERY) {  // Capture is not possible with PHPicker
       if (@available(iOS 14, *)) {
         // PHPicker is used
         [self pickImageWithPHPicker:1];
       } else {
         // UIImagePicker is used
-        [self pickImageWithUIImagePicker];
+        [self launchUIImagePickerWithSource:imageSource];
       }
     } else {
-      [self pickImageWithUIImagePicker];
+      [self launchUIImagePickerWithSource:imageSource];
     }
   } else if ([@"pickMultiImage" isEqualToString:call.method]) {
     if (@available(iOS 14, *)) {
-      self.result = result;
-      _arguments = call.arguments;
       [self pickImageWithPHPicker:0];
     } else {
-      [self pickImageWithUIImagePicker];
+      [self launchUIImagePickerWithSource:SOURCE_GALLERY];
     }
   } else if ([@"pickVideo" isEqualToString:call.method]) {
-    _imagePickerController = [[UIImagePickerController alloc] init];
+    [self initImagePickerController];
     _imagePickerController.modalPresentationStyle = UIModalPresentationCurrentContext;
     _imagePickerController.delegate = self;
     _imagePickerController.mediaTypes = @[
@@ -175,12 +194,9 @@ - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result
     ];
     _imagePickerController.videoQuality = UIImagePickerControllerQualityTypeHigh;
 
-    self.result = result;
-    _arguments = call.arguments;
-
-    int imageSource = [[_arguments objectForKey:@"source"] intValue];
-    if ([[_arguments objectForKey:@"maxDuration"] isKindOfClass:[NSNumber class]]) {
-      NSTimeInterval max = [[_arguments objectForKey:@"maxDuration"] doubleValue];
+    int imageSource = [[call.arguments objectForKey:@"source"] intValue];
+    if ([[call.arguments objectForKey:@"maxDuration"] isKindOfClass:[NSNumber class]]) {
+      NSTimeInterval max = [[call.arguments objectForKey:@"maxDuration"] doubleValue];
       _imagePickerController.videoMaximumDuration = max;
     }
 

packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin_Test.h

@@ -40,4 +40,12 @@
  */
 - (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker;
 
+/**
+ * Sets the UIImagePickerController instance that should be used by the
+ * image_picker plugin.
+ *
+ * Should be used for testing purposes only.
+ */
+- (void)setImagePickerControllerOverride:(UIImagePickerController *)imagePickerController;
+
 @end

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/main/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+7
+version: 0.8.4+8
 
 environment:
   sdk: ">=2.14.0 <3.0.0"