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

Author: iheron

packages/image_picker/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.6.4+1
+
+* Fix a bug, sometimes double click cancel button will crash.
+
 ## 0.6.4
 
 * Add a new parameter to select preferred camera device.

packages/image_picker/example/ios/Runner.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		14791121244188AC0028A572 /* ImagePickerPluginTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 14791120244188AC0028A572 /* ImagePickerPluginTests.m */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; };
 		3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -55,6 +56,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		14791120244188AC0028A572 /* ImagePickerPluginTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ImagePickerPluginTests.m; path = ../../../ios/Tests/ImagePickerPluginTests.m; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = "<group>"; };
 		5A9D31B91557877A0E8EF3E7 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
@@ -116,6 +118,7 @@
 				68F4B463228B3AB500C25614 /* PhotoAssetUtilTests.m */,
 				F78AF3172342D9D7008449C7 /* ImagePickerTestImages.h */,
 				F78AF3182342D9D7008449C7 /* ImagePickerTestImages.m */,
+				14791120244188AC0028A572 /* ImagePickerPluginTests.m */,
 			);
 			path = image_picker_exampleTests;
 			sourceTree = "<group>";
@@ -390,6 +393,7 @@
 				9FC8F0EE229FB90B00C8D58F /* ImageUtilTests.m in Sources */,
 				F78AF3192342D9D7008449C7 /* ImagePickerTestImages.m in Sources */,
 				680049262280D736006DD6AB /* MetaDataUtilTests.m in Sources */,
+				14791121244188AC0028A572 /* ImagePickerPluginTests.m in Sources */,
 				68F4B464228B3AB500C25614 /* PhotoAssetUtilTests.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

packages/image_picker/ios/Classes/FLTImagePickerPlugin.m

@@ -323,8 +323,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,14 +61,30 @@ - (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;
   }
   FLTImagePickerPlugin *plugin =
       [[FLTImagePickerPlugin alloc] initWithViewController:[UIViewController new]];
   FlutterMethodCall *call =
-      [FlutterMethodCall methodCallWithMethodName:@"pickVideo"
+      [FlutterMethodCall methodCallWithMethodName:@"pickImage"
                                         arguments:@{@"source" : @(0), @"cameraDevice" : @(1)}];
   [plugin handleMethodCall:call
                     result:^(id _Nullable r){

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.4
+version: 0.6.4+1
 
 flutter:
   plugin: