@connectedbits/react-native-image-picker 2.4.8 → 2.4.12

package/android/.idea/workspace.xml

@@ -106,10 +106,10 @@
     <servers />
   </component>
   <component name="WindowStateProjectService">
-    <state x="972" y="271" width="615" height="490" key="find.popup" timestamp="1614704965858">
+    <state x="972" y="271" width="615" height="490" key="find.popup" timestamp="1614713491506">
       <screen x="0" y="25" width="2560" height="983" />
     </state>
-    <state x="972" y="271" width="615" height="490" key="find.popup/0.25.2560.983@0.25.2560.983" timestamp="1614704965858" />
+    <state x="972" y="271" width="615" height="490" key="find.popup/0.25.2560.983@0.25.2560.983" timestamp="1614713491506" />
   </component>
   <component name="masterDetails">
     <states>

package/ios/ImagePickerManager.m

@@ -299,7 +299,7 @@ RCT_EXPORT_METHOD(showImagePicker:(NSDictionary *)options callback:(RCTResponseS
             else {
                 originalImage = [info objectForKey:UIImagePickerControllerOriginalImage];
             }
-
+            
             if (imageURL) {
                 PHAsset *pickedAsset;
                 if (@available(iOS 11.0, *)) {
@@ -334,6 +334,8 @@ RCT_EXPORT_METHOD(showImagePicker:(NSDictionary *)options callback:(RCTResponseS
                     [gifResponse setObject:@(originalImage.size.width) forKey:@"width"];
                     [gifResponse setObject:@(originalImage.size.height) forKey:@"height"];
 
+                    [self populateResponse:gifResponse fromAsset:asset];
+                    
                     BOOL vertical = (originalImage.size.width < originalImage.size.height) ? YES : NO;
                     [gifResponse setObject:@(vertical) forKey:@"isVertical"];
 
@@ -351,10 +353,13 @@ RCT_EXPORT_METHOD(showImagePicker:(NSDictionary *)options callback:(RCTResponseS
                     if (fileSizeValue){
                         [gifResponse setObject:fileSizeValue forKey:@"fileSize"];
                     }
-
-                    self.callback(@[gifResponse]);
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        self.callback(@[gifResponse]);
+                    });
                 } failureBlock:^(NSError *error) {
-                    self.callback(@[@{@"error": error.localizedFailureReason}]);
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        self.callback(@[@{@"error": error.localizedFailureReason}]);
+                    });
                 }];
                 return;
             }
@@ -376,11 +381,11 @@ RCT_EXPORT_METHOD(showImagePicker:(NSDictionary *)options callback:(RCTResponseS
             NSString *mimeType;
             if ([[self.options objectForKey:@"imageFileType"] isEqualToString:@"png"]) {
                 data = UIImagePNGRepresentation(editedImage);
-                mimeType = (__bridge_transfer NSString *)(UTTypeCopyPreferredTagWithClass(kUTTypePNG, kUTTagClassMIMEType));
+                mimeType = (__bridge_transfer NSString *)@"image/png";
             }
             else {
                 data = UIImageJPEGRepresentation(editedImage, [[self.options valueForKey:@"quality"] floatValue]);
-                mimeType = (__bridge_transfer NSString *)(UTTypeCopyPreferredTagWithClass(kUTTypeJPEG, kUTTagClassMIMEType));
+                mimeType = (__bridge_transfer NSString *)@"image/jpeg";
             }
             [self.response setObject:mimeType forKey:@"type"];
             [data writeToFile:path atomically:YES];
@@ -430,7 +435,7 @@ RCT_EXPORT_METHOD(showImagePicker:(NSDictionary *)options callback:(RCTResponseS
                                     self.response[@"timestamp"] = [[ImagePickerManager ISO8601DateFormatter] stringFromDate:capturedAsset.creationDate];
                                 }
                             }
-                            self.callback(@[self.response]);
+                            [self dispatchCallbackForUrl:assetURL withResponse:self.response];
                         }
                     }];
                 } else {
@@ -491,7 +496,9 @@ RCT_EXPORT_METHOD(showImagePicker:(NSDictionary *)options callback:(RCTResponseS
                 ALAssetsLibrary *library = [[ALAssetsLibrary alloc] init];
                 [library writeVideoAtPathToSavedPhotosAlbum:videoDestinationURL completionBlock:^(NSURL *assetURL, NSError *error) {
                     if (error) {
-                        self.callback(@[@{@"error": error.localizedFailureReason}]);
+                        dispatch_async(dispatch_get_main_queue(), ^{
+                            self.callback(@[@{@"error": error.localizedFailureReason}]);
+                        });
                         return;
                     } else {
                         NSLog(@"Save video succeed.");
@@ -504,9 +511,12 @@ RCT_EXPORT_METHOD(showImagePicker:(NSDictionary *)options callback:(RCTResponseS
                                 if (capturedAsset.creationDate) {
                                     self.response[@"timestamp"] = [[ImagePickerManager ISO8601DateFormatter] stringFromDate:capturedAsset.creationDate];
                                 }
+                                [self dispatchCallbackForUrl:assetURL withResponse:self.response];
+                            } else {
+                                [self dispatchCallbackForUrl:[info valueForKey:UIImagePickerControllerReferenceURL] withResponse:self.response];
                             }
 
-                            self.callback(@[self.response]);
+
                         }
                     }
                 }];
@@ -525,11 +535,11 @@ RCT_EXPORT_METHOD(showImagePicker:(NSDictionary *)options callback:(RCTResponseS
                 [[storageOptions objectForKey:@"cameraRoll"] boolValue] == NO ||
                 self.picker.sourceType != UIImagePickerControllerSourceTypeCamera)
             {
-                self.callback(@[self.response]);
+                [self dispatchCallbackForUrl:[info valueForKey:UIImagePickerControllerReferenceURL] withResponse:self.response];
             }
         }
         else {
-            self.callback(@[self.response]);
+            [self dispatchCallbackForUrl:[info valueForKey:UIImagePickerControllerReferenceURL] withResponse:self.response];
         }
     };
 
@@ -538,6 +548,39 @@ RCT_EXPORT_METHOD(showImagePicker:(NSDictionary *)options callback:(RCTResponseS
     });
 }
 
+- (void) populateResponse:(NSMutableDictionary *) response fromAsset:(ALAsset *) asset {
+    CLLocation * location = [asset valueForProperty:ALAssetPropertyLocation];
+    if(location){
+        response[@"latitude"] = @(location.coordinate.latitude);
+        response[@"longitude"] = @(location.coordinate.longitude);
+    }
+}
+
+- (void) dispatchCallbackForUrl: (NSURL *) url withResponse: (NSMutableDictionary *)response {
+    if(!url){
+        dispatch_async(dispatch_get_main_queue(), ^{
+            self.callback(@[response]);
+        });
+    }
+    if(response && !response[@"latitude"] && !response[@"longitude"]){
+        ALAssetsLibrary * library = [[ALAssetsLibrary alloc] init];
+        [library assetForURL:url resultBlock:^(ALAsset * asset){
+            [self populateResponse:response fromAsset:asset];
+            dispatch_async(dispatch_get_main_queue(), ^{
+                self.callback(@[response]);
+            });
+        } failureBlock:^(NSError * error){
+            dispatch_async(dispatch_get_main_queue(), ^{
+                self.callback(@[response]);
+            });
+        }];
+    } else {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            self.callback(@[response]);
+        });
+    }
+}
+
 - (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker
 {
     dispatch_async(dispatch_get_main_queue(), ^{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@connectedbits/react-native-image-picker",
-  "version": "2.4.8",
+  "version": "2.4.12",
   "description": "A React Native module that allows you to use native UI to select media from the device library or directly from the camera",
   "react-native": "src/index.ts",
   "types": "lib/typescript/index.d.ts",