feat: add type to assets (#1808)

react-native-image-picker · Sep 21, 2021 · 383c123 · 383c123
1 parent c4b462f
commit 383c123
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 15 deletions.
diff --git a/android/src/main/java/com/imagepicker/Utils.java b/android/src/main/java/com/imagepicker/Utils.java
@@ -346,25 +346,24 @@ public static boolean isCameraPermissionFulfilled(Context context, Activity acti
     }
 
     static boolean isImageType(Uri uri, Context context) {
-        String imageMimeType = "image/";
+        final String imageMimeType = "image/";
 
-        if (uri.getScheme().equals("file")) {
-            return getMimeTypeFromFileUri(uri).contains(imageMimeType);
-        }
-
-        ContentResolver contentResolver = context.getContentResolver();
-        return contentResolver.getType(uri).contains(imageMimeType);
+        return getMimeType(uri, context).contains(imageMimeType);
     }
 
     static boolean isVideoType(Uri uri, Context context) {
-        String videoMimeType = "video/";
+        final String videoMimeType = "video/";
 
-        if (uri.getScheme().equals("file")) {
-            return getMimeTypeFromFileUri(uri).contains(videoMimeType);
-        }
-
-        ContentResolver contentResolver = context.getContentResolver();
-        return contentResolver.getType(uri).contains("video/");
+        return getMimeType(uri, context).contains(videoMimeType);
+    }
+
+    static String getMimeType(Uri uri, Context context) {
+      if (uri.getScheme().equals("file")) {
+        return getMimeTypeFromFileUri(uri);
+      }
+
+      ContentResolver contentResolver = context.getContentResolver();
+      return contentResolver.getType(uri);
     }
 
     static List<Uri> collectUrisFromData(Intent data) {
@@ -395,6 +394,7 @@ static ReadableMap getImageResponseMap(Uri uri, Options options, Context context
         map.putString("type", getMimeTypeFromFileUri(uri));
         map.putInt("width", dimensions[0]);
         map.putInt("height", dimensions[1]);
+        map.putString("type", getMimeType(uri, context));
 
         if (options.includeBase64) {
             map.putString("base64", getBase64String(uri, context));
@@ -409,6 +409,7 @@ static ReadableMap getVideoResponseMap(Uri uri, Context context) {
         map.putDouble("fileSize", getFileSize(uri, context));
         map.putInt("duration", getDuration(uri, context));
         map.putString("fileName", fileName);
+        map.putString("type", getMimeType(uri, context));
         return map;
     }
 

diff --git a/ios/ImagePickerManager.m b/ios/ImagePickerManager.m
@@ -180,6 +180,7 @@ -(NSMutableDictionary *)mapVideoToAsset:(NSURL *)url error:(NSError **)error {
     NSMutableDictionary *asset = [[NSMutableDictionary alloc] init];
     asset[@"duration"] = @(roundf(CMTimeGetSeconds([AVAsset assetWithURL:videoDestinationURL].duration)));
     asset[@"uri"] = videoDestinationURL.absoluteString;
+    asset[@"type"] = [ImagePickerUtils getFileTypeFromUrl:videoDestinationURL];
 
     return asset;
 }

diff --git a/ios/ImagePickerUtils.h b/ios/ImagePickerUtils.h
@@ -13,5 +13,7 @@
 + (NSString*)getFileType:(NSData*)imageData;
 
 + (UIImage*)resizeImage:(UIImage*)image maxWidth:(float)maxWidth maxHeight:(float)maxHeight;
+
++ (NSString *) getFileTypeFromUrl:(NSURL *)url;
 
 @end
diff --git a/ios/ImagePickerUtils.m b/ios/ImagePickerUtils.m
@@ -95,6 +95,14 @@ + (NSString*) getFileType:(NSData *)imageData
     }
 }
 
++ (NSString *) getFileTypeFromUrl:(NSURL *)url {
+    CFStringRef fileExtension = (__bridge CFStringRef)[url pathExtension];
+    CFStringRef UTI = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, fileExtension, NULL);
+    CFStringRef MIMEType = UTTypeCopyPreferredTagWithClass(UTI, kUTTagClassMIMEType);
+    CFRelease(UTI);
+    return (__bridge_transfer NSString *)MIMEType;
+}
+
 + (UIImage*)resizeImage:(UIImage*)image maxWidth:(float)maxWidth maxHeight:(float)maxHeight
 {
     if ((maxWidth == 0) || (maxHeight == 0)) {

diff --git a/src/types.ts b/src/types.ts
@@ -23,7 +23,7 @@ export interface Asset {
   width?: number;
   height?: number;
   fileSize?: number;
-  type?: string; //TODO
+  type?: string;
   fileName?: string;
   duration?: number;
 }