github/cordova-plugin-camera
3
0
Fork 0
mirror of https://github.com/apache/cordova-plugin-camera.git synced 2026-05-18 00:00:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ios): get correctly metadata with PHPicker (#944)

Browse Source 
- `pickerResult.assetIdentifier` was wrongly used to get metadata, while `PHPickerConfiguration` was initialized with `init` which will not return any asset identifiers. Only `initWithPhotoLibrary:` would work. Since `init` is more flexible and lets the picker return items that aren’t PHAssets (e.g., cloud/shared providers) we use that and do not rely anymore on `assetIdentifier` to get the image data. The image data will now get by `[NSItemProvider loadDataRepresentationForTypeIdentifier:]` instead of `[PHImageManager requestImageDataAndOrientationForAsset:]`. The image data is needed to get meta data.
This commit is contained in:
Manuel Beck
2026-01-29 20:11:08 +01:00
committed by GitHub
parent fe1896cf1e
commit 3c1268531e
1 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ios/CDVCamera.m
+14 -31
View File
@@ -298,6 +298,10 @@ static NSString* MIME_JPEG = @"image/jpeg";
{
// PHPicker must be created and presented on the main thread.
dispatch_async(dispatch_get_main_queue(), ^{
// Using [PHPickerConfiguration init] instead of
// [PHPickerConfiguration initWithPhotoLibrary:[PHPhotoLibrary sharedPhotoLibrary]]
// is more open and lets the picker return items that aren’t PHAssets, like cloud/shared providers,
// but will not return asset identifiers.
PHPickerConfiguration *config = [[PHPickerConfiguration alloc] init];
// Configure filter based on media type
@@ -397,43 +401,22 @@ static NSString* MIME_JPEG = @"image/jpeg";
}];
// Handle image
} else if ([pickerResult.itemProvider canLoadObjectOfClass:[UIImage class]]) {
[pickerResult.itemProvider loadObjectOfClass:[UIImage class] completionHandler:^(__kindof id<NSItemProviderReading> _Nullable object, NSError * _Nullable error) {
} else if ([pickerResult.itemProvider hasItemConformingToTypeIdentifier:UTTypeImage.identifier]) {
// Load image data for the NSItemProvider
[pickerResult.itemProvider loadDataRepresentationForTypeIdentifier:UTTypeImage.identifier
completionHandler:^(NSData * _Nullable imageData, NSError * _Nullable error) {
if (error) {
CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:[error localizedDescription]];
CDVPluginResult* result = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR
messageAsString:[error localizedDescription]];
[weakSelf.commandDelegate sendPluginResult:result callbackId:callbackId];
weakSelf.hasPendingOperation = NO;
return;
}
UIImage *image = (UIImage *)object;
// Fetch metadata if asset identifier is available
if (pickerResult.assetIdentifier) {
PHFetchResult *result = [PHAsset fetchAssetsWithLocalIdentifiers:@[pickerResult.assetIdentifier] options:nil];
PHAsset *asset = result.firstObject;
if (asset) {
PHImageRequestOptions *imageOptions = [[PHImageRequestOptions alloc] init];
imageOptions.synchronous = YES;
imageOptions.networkAccessAllowed = YES;
[[PHImageManager defaultManager] requestImageDataAndOrientationForAsset:asset
options:imageOptions
resultHandler:^(NSData *_Nullable imageData, NSString *_Nullable dataUTI, CGImagePropertyOrientation orientation, NSDictionary *_Nullable info) {
NSDictionary *metadata = imageData ? [weakSelf convertImageMetadata:imageData] : nil;
[weakSelf finalizePHPickerImage:image
metadata:metadata
callbackId:callbackId
options:pictureOptions];
}];
return;
}
}
// No metadata available
[self finalizePHPickerImage:image metadata:nil callbackId:callbackId options:pictureOptions];
[weakSelf finalizePHPickerImage:[UIImage imageWithData:imageData]
metadata:[weakSelf convertImageMetadata:imageData]
callbackId:callbackId
options:pictureOptions];
}];
}
}];