Skip to content

refactor(ios): resultForImage: #951

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

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

refactor(ios): resultForImage: #951

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64b2846
refactor(ios): small refactoring on `resultForImage:`
GitToTheHub Feb 3, 2026
277e213
fix(ios): Improve code for meta data processing in `resultForImage:``
GitToTheHub Feb 4, 2026
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
65 changes: 37 additions & 28 deletions src/ios/CDVCamera.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,68 +740,76 @@ - (UIImage*)retrieveImage:(NSDictionary*)info options:(CDVPictureOptions*)option
return (scaledImage == nil ? image : scaledImage);
}

- (void)resultForImage:(CDVPictureOptions*)options
- (void)resultForImage:(CDVPictureOptions*)pictureOptions
info:(NSDictionary*)info
completion:(void (^)(CDVPluginResult* res))completion
{
CDVPluginResult* result = nil;
BOOL saveToPhotoAlbum = options.saveToPhotoAlbum;
UIImage* image = nil;

switch (options.destinationType) {
switch (pictureOptions.destinationType) {
case DestinationTypeDataUrl:
{
image = [self retrieveImage:info options:options];
NSString* data = [self processImageAsDataUri:image info:info options:options];
image = [self retrieveImage:info options:pictureOptions];
NSString* data = [self processImageAsDataUri:image info:info options:pictureOptions];
if (data) {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString: data];
}
}
break;
default: // DestinationTypeFileUri
{
image = [self retrieveImage:info options:options];
NSData* data = [self processImage:image info:info options:options];
image = [self retrieveImage:info options:pictureOptions];
NSData* imageData = [self processImage:image info:info options:pictureOptions];

if (data) {
if (self.cdvUIImagePickerController.sourceType == UIImagePickerControllerSourceTypePhotoLibrary) {
NSMutableData *imageDataWithExif = [NSMutableData data];
if (imageData) {
if (pictureOptions.sourceType == UIImagePickerControllerSourceTypePhotoLibrary) {

NSData *imageDataToWrite = imageData;

// Copy custom choosen meta data stored in self.metadata to the image
if (self.metadata) {
CGImageSourceRef sourceImage = CGImageSourceCreateWithData((__bridge CFDataRef)self.data, NULL);
NSMutableData *imageDataWithCustomMetaData = [NSMutableData data];

// Prepare source image
CGImageSourceRef sourceImage = CGImageSourceCreateWithData((__bridge CFDataRef)imageDataToWrite, NULL);
CFStringRef sourceType = CGImageSourceGetType(sourceImage);

CGImageDestinationRef destinationImage = CGImageDestinationCreateWithData((__bridge CFMutableDataRef)imageDataWithExif, sourceType, 1, NULL);

// Prepare dest image
CGImageDestinationRef destinationImage = CGImageDestinationCreateWithData((__bridge CFMutableDataRef)imageDataWithCustomMetaData, sourceType, 1, NULL);

// Copy source to dest with self.metadata
CGImageDestinationAddImageFromSource(destinationImage, sourceImage, 0, (__bridge CFDictionaryRef)self.metadata);
CGImageDestinationFinalize(destinationImage);

CFRelease(sourceImage);
CFRelease(destinationImage);
} else {
imageDataWithExif = [self.data mutableCopy];
imageDataToWrite = imageDataWithCustomMetaData;
}

NSString* tempFilePath = [self tempFilePathForExtension:pictureOptions.encodingType == EncodingTypePNG ? @"png":@"jpg"];
NSError* err = nil;
NSString* extension = self.cdvUIImagePickerController.pictureOptions.encodingType == EncodingTypePNG ? @"png":@"jpg";
NSString* filePath = [self tempFilePathForExtension:extension];

// save file
if (![imageDataWithExif writeToFile:filePath options:NSAtomicWrite error:&err]) {

// Write image to temp path
if ([imageDataToWrite writeToFile:tempFilePath options:NSAtomicWrite error:&err]) {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
messageAsString:[[NSURL fileURLWithPath:tempFilePath] absoluteString]];

// Write was not successful
} else {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_IO_EXCEPTION
messageAsString:[err localizedDescription]];
}
else {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK
messageAsString:[[NSURL fileURLWithPath:filePath] absoluteString]];
}

} else if (self.cdvUIImagePickerController.sourceType != UIImagePickerControllerSourceTypeCamera || !options.usesGeolocation) {
} else if (pictureOptions.sourceType != UIImagePickerControllerSourceTypeCamera || !pictureOptions.usesGeolocation) {
// No need to save file if usesGeolocation is true since it will be saved after the location is tracked
NSString* extension = options.encodingType == EncodingTypePNG? @"png" : @"jpg";
NSString* extension = pictureOptions.encodingType == EncodingTypePNG? @"png" : @"jpg";
NSString* filePath = [self tempFilePathForExtension:extension];
NSError* err = nil;

// save file
if (![data writeToFile:filePath options:NSAtomicWrite error:&err]) {
if (![imageData writeToFile:filePath options:NSAtomicWrite error:&err]) {
result = [CDVPluginResult resultWithStatus:CDVCommandStatus_IO_EXCEPTION
messageAsString:[err localizedDescription]];
} else {
Expand All @@ -815,7 +823,8 @@ - (void)resultForImage:(CDVPictureOptions*)options
break;
};

if (saveToPhotoAlbum && image) {
// Save the image to the photo album after capture
if (pictureOptions.saveToPhotoAlbum && image) {
UIImageWriteToSavedPhotosAlbum(image, nil, nil, nil);
}

Expand Down
Loading