[image_picker] fix bug, sometimes double click cancel button will crash

Author: iheron

packages/image_picker/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.5+1
+
+* Fix a bug, sometimes double click cancel button will crash.
+
 ## 0.6.5
 
 * Set maximum duration for video recording.

packages/image_picker/ios/Classes/FLTImagePickerPlugin.m

@@ -327,8 +327,10 @@ - (void)imagePickerController:(UIImagePickerController *)picker
 
 - (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
   [_imagePickerController dismissViewControllerAnimated:YES completion:nil];
+  if (!self.result) {
+    return;
+  }
   self.result(nil);
-
   self.result = nil;
   _arguments = nil;
 }

packages/image_picker/ios/Tests/ImagePickerPluginTests.m

@@ -61,6 +61,22 @@ - (void)testPluginPickVideoDeviceBack {
                  UIImagePickerControllerCameraDeviceRear);
 }
 
+- (void)testPluginPickImageDeviceCancel {
+  if ([UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
+    return;
+  }
+  FLTImagePickerPlugin *plugin =
+      [[FLTImagePickerPlugin alloc] initWithViewController:[UIViewController new]];
+  FlutterMethodCall *call =
+      [FlutterMethodCall methodCallWithMethodName:@"pickImage"
+                                        arguments:@{@"source" : @(0), @"cameraDevice" : @(1)}];
+  [plugin handleMethodCall:call
+                    result:^(id _Nullable r){
+                    }];
+  // todo test imagePickerControllerDidCancel when result is nil
+  
+}
+
 - (void)testPluginPickVideoDeviceFront {
   if (![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera]) {
     return;

packages/image_picker/pubspec.yaml

@@ -2,7 +2,7 @@ name: image_picker
 description: Flutter plugin for selecting images from the Android and iOS image
   library, and taking new pictures with the camera.
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
-version: 0.6.5
+version: 0.6.5+1
 
 flutter:
   plugin: