[image_picker] Fix a crash when user takes a photo using devices unde…

…r iOS 11 (#1862)
flutter · Jul 16, 2019 · e543129 · e543129
1 parent f33f695
commit e543129
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 2 deletions.
diff --git a/packages/image_picker/CHANGELOG.md b/packages/image_picker/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.0+17
+
+* iOS: Fix a crash when user captures image from the camera with devices under iOS 11.
+
 ## 0.6.0+16
 
 * iOS Simulator: fix hang after trying to take an image from the non-existent camera.

diff --git a/packages/image_picker/example/ios/image_picker_exampleTests/PhotoAssetUtilTests.m b/packages/image_picker/example/ios/image_picker_exampleTests/PhotoAssetUtilTests.m
@@ -18,6 +18,11 @@ - (void)setUp {
   self.testBundle = [NSBundle bundleForClass:self.class];
 }
 
+- (void)getAssetFromImagePickerInfoShouldReturnNilIfNotAvailable {
+  NSDictionary *mockData = @{};
+  XCTAssertNil([FLTImagePickerPhotoAssetUtil getAssetFromImagePickerInfo:mockData]);
+}
+
 - (void)testSaveImageWithOriginalImageData_ShouldSaveWithTheCorrectExtentionAndMetaData {
   // test jpg
   NSData *dataJPG = [NSData dataWithContentsOfFile:[self.testBundle pathForResource:@"jpgImage"

diff --git a/packages/image_picker/ios/Classes/FLTImagePickerPhotoAssetUtil.h b/packages/image_picker/ios/Classes/FLTImagePickerPhotoAssetUtil.h
@@ -11,7 +11,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface FLTImagePickerPhotoAssetUtil : NSObject
 
-+ (PHAsset *)getAssetFromImagePickerInfo:(NSDictionary *)info;
++ (nullable PHAsset *)getAssetFromImagePickerInfo:(NSDictionary *)info;
 
 // Save image with correct meta data and extention copied from the original asset.
 // maxWidth and maxHeight are used only for GIF images.

diff --git a/packages/image_picker/ios/Classes/FLTImagePickerPhotoAssetUtil.m b/packages/image_picker/ios/Classes/FLTImagePickerPhotoAssetUtil.m
@@ -15,6 +15,9 @@ + (PHAsset *)getAssetFromImagePickerInfo:(NSDictionary *)info {
     return [info objectForKey:UIImagePickerControllerPHAsset];
   }
   NSURL *referenceURL = [info objectForKey:UIImagePickerControllerReferenceURL];
+  if (!referenceURL) {
+    return nil;
+  }
   PHFetchResult<PHAsset *> *result = [PHAsset fetchAssetsWithALAssetURLs:@[ referenceURL ]
                                                                  options:nil];
   return result.firstObject;

diff --git a/packages/image_picker/pubspec.yaml b/packages/image_picker/pubspec.yaml
@@ -6,7 +6,7 @@ authors:
   - Rhodes Davis Jr. <rody.davis.jr@gmail.com>
 homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker
 
-version: 0.6.0+16
+version: 0.6.0+17
 
 flutter:
   plugin: