From c6366e4dd8110a05046894968dc8548aed7c26db Mon Sep 17 00:00:00 2001 From: Ryan Linton Date: Tue, 9 Feb 2016 04:44:43 -0800 Subject: [PATCH] Use media url instead of reference url when picking movie types in image picker Summary: I ran into an issue trying to upload videos selected with ImagePickerIOS to S3. The file would upload just fine but would be reduced in size and have no duration. It appears to be just a thumbnail of the video. Using the media url resolves this. Closes https://github.com/facebook/react-native/pull/5771 Reviewed By: svcscm Differential Revision: D2905720 Pulled By: nicklockwood fb-gh-sync-id: 4b0200652c3b6a62cdb65deb582fbc5829c577a6 shipit-source-id: 4b0200652c3b6a62cdb65deb582fbc5829c577a6 --- Libraries/CameraRoll/RCTImagePickerManager.m | 36 +++++++++----------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/Libraries/CameraRoll/RCTImagePickerManager.m b/Libraries/CameraRoll/RCTImagePickerManager.m index 0f97099ad851a9..e772ce0816db2b 100644 --- a/Libraries/CameraRoll/RCTImagePickerManager.m +++ b/Libraries/CameraRoll/RCTImagePickerManager.m @@ -104,26 +104,24 @@ - (dispatch_queue_t)methodQueue - (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info { - // Image from PhotoLibrary - NSString *imageUri = [info[UIImagePickerControllerReferenceURL] absoluteString]; - if (imageUri) { - [self _dismissPicker:picker args:@[imageUri]]; - - } else { - // Image from CameraRoll hasn't uri. - // We need to save it to the store first. - UIImage *originalImage = info[UIImagePickerControllerOriginalImage]; - - // WARNING: Using imageStoreManager causes memory leak - // because image isn't removed from store once we're done using it - [_bridge.imageStoreManager storeImage:originalImage withBlock:^(NSString *tempImageTag) { - if (!tempImageTag) { - [self _dismissPicker:picker args:nil]; - return; - } - [self _dismissPicker:picker args:@[tempImageTag]]; - }]; + NSString *mediaType = info[UIImagePickerControllerMediaType]; + BOOL isMovie = [mediaType isEqualToString:(NSString *)kUTTypeMovie]; + NSString *key = isMovie ? UIImagePickerControllerMediaURL : UIImagePickerControllerReferenceURL; + NSURL *imageURL = info[key]; + if (imageURL) { + [self _dismissPicker:picker args:@[imageURL.absoluteString]]; + return; } + + // This is a newly taken image, and doesn't have a URL yet. + // We need to save it to the image store first. + UIImage *originalImage = info[UIImagePickerControllerOriginalImage]; + + // WARNING: Using ImageStoreManager may cause a memory leak because the + // image isn't automatically removed from store once we're done using it. + [_bridge.imageStoreManager storeImage:originalImage withBlock:^(NSString *tempImageTag) { + [self _dismissPicker:picker args:tempImageTag ? @[tempImageTag] : nil]; + }]; } - (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker