Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ios): Importing corrupt images using the Camera plugin crashes the app (CB-13415) #310

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

fix(ios): Importing corrupt images using the Camera plugin crashes the app (CB-13415) #310

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8eafce0
Camera plugin issue for corrupted image iOS
alpesh12 Jan 25, 2018
e81b825
Chaged block return statement
alpesh12 Jan 26, 2018
2048c0c
Added async image processing as author suggest
alpesh12 Jan 26, 2018
2b854a7
solved geolocation bug and removed extra comments
jd0048 Jan 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/ios/CDVCamera.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Licensed to the Apache Software Foundation (ASF) under one
#import <ImageIO/CGImageDestination.h>
#import <MobileCoreServices/UTCoreTypes.h>
#import <objc/message.h>
#import <Photos/Photos.h>

#ifndef __CORDOVA_4_0_0
#import <Cordova/NSData+Base64.h>
Expand Down Expand Up @@ -360,7 +361,22 @@ - (NSData*)processImage:(UIImage*)image info:(NSDictionary*)info options:(CDVPic
{
if ((options.allowsEditing == NO) && (options.targetSize.width <= 0) && (options.targetSize.height <= 0) && (options.correctOrientation == NO) && (([options.quality integerValue] == 100) || (options.sourceType != UIImagePickerControllerSourceTypeCamera))){
// use image unedited as requested , don't resize
data = UIImageJPEGRepresentation(image, 1.0);
if(options.sourceType != UIImagePickerControllerSourceTypeCamera){
NSURL *url = info[UIImagePickerControllerReferenceURL];
PHFetchResult *result = [PHAsset fetchAssetsWithALAssetURLs:@[url] options:nil];
PHAsset *asset = [result firstObject];
if (asset) {
PHImageManager *manager = [PHImageManager defaultManager];
PHImageRequestOptions *option = [PHImageRequestOptions alloc];
option.synchronous = true;
[manager requestImageDataForAsset:asset options:option resultHandler:^(NSData *imageData, NSString *dataUTI, UIImageOrientation orientation, NSDictionary *info) {
data = imageData;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the error that @alsorokin pointed out. Inherently this whole PR has to be re-worked since here on this line, this an async block (a callback) that resides in a synchronous function. For this to work, the processImage function has to be async, and changing that is not trivial.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shazron
Its default functionality from PHFetchResult lib to return data from block to function, so it must be synchronous operation.
Let me know if you have other reference or solution to solved this bug.

}];
}
}
else{
return data = UIImageJPEGRepresentation(image, 1.0);
}
} else {
data = UIImageJPEGRepresentation(image, [options.quality floatValue] / 100.0f);
}
Expand Down