react-native-blob-util 0.22.0 → 0.22.2

package/android/src/main/java/com/ReactNativeBlobUtil/Utils/MimeType.java

@@ -1,70 +1,70 @@
-package com.ReactNativeBlobUtil.Utils;
-
-import android.webkit.MimeTypeMap;
-
-import org.apache.commons.lang3.StringUtils;
-
-public class MimeType {
-    static String UNKNOWN = "*/*";
-    static String BINARY_FILE = "application/octet-stream";
-    static String IMAGE = "image/*";
-    static String AUDIO = "audio/*";
-    static String VIDEO = "video/*";
-    static String TEXT = "text/*";
-    static String FONT = "font/*";
-    static String APPLICATION = "application/*";
-    static String CHEMICAL = "chemical/*";
-    static String MODEL = "model/*";
-
-    /**
-     * * Given `name` = `ABC` AND `mimeType` = `video/mp4`, then return `ABC.mp4`
-     * * Given `name` = `ABC` AND `mimeType` = `null`, then return `ABC`
-     * * Given `name` = `ABC.mp4` AND `mimeType` = `video/mp4`, then return `ABC.mp4`
-     *
-     * @param name can have file extension or not
-     */
-
-    public static String getFullFileName(String name, String mimeType) {
-        // Prior to API 29, MimeType.BINARY_FILE has no file extension
-        String ext = MimeType.getExtensionFromMimeType(mimeType);
-        if ((ext == null || ext.isEmpty()) || name.endsWith("." + ext)) return name;
-        else {
-            String fn = name + "." + ext;
-            if (fn.endsWith(".")) return StringUtils.stripEnd(fn, ".");
-            else return fn;
-        }
-    }
-
-    /**
-     * Some mime types return no file extension on older API levels. This function adds compatibility accross API levels.
-     *
-     * @see this.getExtensionFromMimeTypeOrFileName
-     */
-
-    public static String getExtensionFromMimeType(String mimeType) {
-        if (mimeType != null) {
-            if (mimeType.equals(BINARY_FILE)) return "bin";
-            else return MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType);
-        } else return "";
-    }
-
-    /**
-     * @see this.getExtensionFromMimeType
-     */
-    public static String getExtensionFromMimeTypeOrFileName(String mimeType, String filename) {
-        if (mimeType == null || mimeType.equals(UNKNOWN)) return StringUtils.substringAfterLast(filename, ".");
-        else return getExtensionFromMimeType(mimeType);
-    }
-
-    /**
-     * Some file types return no mime type on older API levels. This function adds compatibility across API levels.
-     */
-    public static String getMimeTypeFromExtension(String fileExtension) {
-        if (fileExtension.equals("bin")) return BINARY_FILE;
-        else {
-            String mt = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension);
-            if (mt != null) return mt;
-            else return UNKNOWN;
-        }
-    }
-}
+package com.ReactNativeBlobUtil.Utils;
+
+import android.webkit.MimeTypeMap;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class MimeType {
+    static String UNKNOWN = "*/*";
+    static String BINARY_FILE = "application/octet-stream";
+    static String IMAGE = "image/*";
+    static String AUDIO = "audio/*";
+    static String VIDEO = "video/*";
+    static String TEXT = "text/*";
+    static String FONT = "font/*";
+    static String APPLICATION = "application/*";
+    static String CHEMICAL = "chemical/*";
+    static String MODEL = "model/*";
+
+    /**
+     * * Given `name` = `ABC` AND `mimeType` = `video/mp4`, then return `ABC.mp4`
+     * * Given `name` = `ABC` AND `mimeType` = `null`, then return `ABC`
+     * * Given `name` = `ABC.mp4` AND `mimeType` = `video/mp4`, then return `ABC.mp4`
+     *
+     * @param name can have file extension or not
+     */
+
+    public static String getFullFileName(String name, String mimeType) {
+        // Prior to API 29, MimeType.BINARY_FILE has no file extension
+        String ext = MimeType.getExtensionFromMimeType(mimeType);
+        if ((ext == null || ext.isEmpty()) || name.endsWith("." + ext)) return name;
+        else {
+            String fn = name + "." + ext;
+            if (fn.endsWith(".")) return StringUtils.stripEnd(fn, ".");
+            else return fn;
+        }
+    }
+
+    /**
+     * Some mime types return no file extension on older API levels. This function adds compatibility accross API levels.
+     *
+     * @see this.getExtensionFromMimeTypeOrFileName
+     */
+
+    public static String getExtensionFromMimeType(String mimeType) {
+        if (mimeType != null) {
+            if (mimeType.equals(BINARY_FILE)) return "bin";
+            else return MimeTypeMap.getSingleton().getExtensionFromMimeType(mimeType);
+        } else return "";
+    }
+
+    /**
+     * @see this.getExtensionFromMimeType
+     */
+    public static String getExtensionFromMimeTypeOrFileName(String mimeType, String filename) {
+        if (mimeType == null || mimeType.equals(UNKNOWN)) return StringUtils.substringAfterLast(filename, ".");
+        else return getExtensionFromMimeType(mimeType);
+    }
+
+    /**
+     * Some file types return no mime type on older API levels. This function adds compatibility across API levels.
+     */
+    public static String getMimeTypeFromExtension(String fileExtension) {
+        if (fileExtension.equals("bin")) return BINARY_FILE;
+        else {
+            String mt = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension);
+            if (mt != null) return mt;
+            else return UNKNOWN;
+        }
+    }
+}

package/android/src/main/java/com/ReactNativeBlobUtil/Utils/PathResolver.java

@@ -1,223 +1,223 @@
-package com.ReactNativeBlobUtil.Utils;
-
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Build;
-import android.provider.DocumentsContract;
-import android.provider.MediaStore;
-import android.content.ContentUris;
-import android.content.ContentResolver;
-
-import com.ReactNativeBlobUtil.ReactNativeBlobUtilUtils;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.FileOutputStream;
-
-public class PathResolver {
-    @TargetApi(19)
-    public static String getRealPathFromURI(final Context context, final Uri uri) {
-
-        final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
-
-        // DocumentProvider
-        if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
-            // ExternalStorageProvider
-            if (isExternalStorageDocument(uri)) {
-                final String docId = DocumentsContract.getDocumentId(uri);
-                final String[] split = docId.split(":");
-                final String type = split[0];
-
-                if ("primary".equalsIgnoreCase(type)) {
-                    File dir = context.getExternalFilesDir(null);
-                    if (dir != null) return dir + "/" + split[1];
-                    return "";
-                }
-
-                // TODO handle non-primary volumes
-            }
-            // DownloadsProvider
-            else if (isDownloadsDocument(uri)) {
-                try {
-                    final String id = DocumentsContract.getDocumentId(uri);
-                    //Starting with Android O, this "id" is not necessarily a long (row number),
-                    //but might also be a "raw:/some/file/path" URL
-                    if (id != null && id.startsWith("raw:/")) {
-                        Uri rawuri = Uri.parse(id);
-                        String path = rawuri.getPath();
-                        return path;
-                    }
-
-                    Long docId = null;
-                    //Since Android 10, uri can start with msf scheme like "msf:12345"
-                    if (id != null && id.startsWith("msf:")) {
-                        final String[] split = id.split(":");
-                        docId = Long.valueOf(split[1]);
-                    } else {
-                        docId = Long.valueOf(id);
-                    }
-
-                    final Uri contentUri = ContentUris.withAppendedId(
-                            Uri.parse("content://downloads/public_downloads"), docId);
-                    return getDataColumn(context, contentUri, null, null);
-                } catch (Exception ex) {
-                    //something went wrong, but android should still be able to handle the original uri by returning null here (see readFile(...))
-                    return null;
-                }
-
-            }
-            // MediaProvider
-            else if (isMediaDocument(uri)) {
-                final String docId = DocumentsContract.getDocumentId(uri);
-                final String[] split = docId.split(":");
-                final String type = split[0];
-
-                Uri contentUri = null;
-                if ("image".equals(type)) {
-                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
-                } else if ("video".equals(type)) {
-                    contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
-                } else if ("audio".equals(type)) {
-                    contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
-                }
-
-                final String selection = "_id=?";
-                final String[] selectionArgs = new String[]{
-                        split[1]
-                };
-
-                return getDataColumn(context, contentUri, selection, selectionArgs);
-            } else if ("content".equalsIgnoreCase(uri.getScheme())) {
-
-                // Return the remote address
-                if (isGooglePhotosUri(uri))
-                    return uri.getLastPathSegment();
-
-                return getDataColumn(context, uri, null, null);
-            }
-            // Other Providers
-            else {
-                try {
-                    InputStream attachment = context.getContentResolver().openInputStream(uri);
-                    if (attachment != null) {
-                        String filename = getContentName(context.getContentResolver(), uri);
-                        if (filename != null) {
-                            File file = new File(context.getCacheDir(), filename);
-                            FileOutputStream tmp = new FileOutputStream(file);
-                            byte[] buffer = new byte[1024];
-                            while (attachment.read(buffer) > 0) {
-                                tmp.write(buffer);
-                            }
-                            tmp.close();
-                            attachment.close();
-                            return file.getAbsolutePath();
-                        }
-                    }
-                } catch (Exception e) {
-                    ReactNativeBlobUtilUtils.emitWarningEvent(e.toString());
-                    return null;
-                }
-            }
-        }
-        // MediaStore (and general)
-        else if ("content".equalsIgnoreCase(uri.getScheme())) {
-
-            // Return the remote address
-            if (isGooglePhotosUri(uri))
-                return uri.getLastPathSegment();
-
-            return getDataColumn(context, uri, null, null);
-        }
-        // File
-        else if ("file".equalsIgnoreCase(uri.getScheme())) {
-            return uri.getPath();
-        }
-
-        return null;
-    }
-
-    private static String getContentName(ContentResolver resolver, Uri uri) {
-        Cursor cursor = resolver.query(uri, null, null, null, null);
-        cursor.moveToFirst();
-        int nameIndex = cursor.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME);
-        if (nameIndex >= 0) {
-            String name = cursor.getString(nameIndex);
-            cursor.close();
-            return name;
-        }
-        return null;
-    }
-
-    /**
-     * Get the value of the data column for this Uri. This is useful for
-     * MediaStore Uris, and other file-based ContentProviders.
-     *
-     * @param context       The context.
-     * @param uri           The Uri to query.
-     * @param selection     (Optional) Filter used in the query.
-     * @param selectionArgs (Optional) Selection arguments used in the query.
-     * @return The value of the _data column, which is typically a file path.
-     */
-    public static String getDataColumn(Context context, Uri uri, String selection,
-                                       String[] selectionArgs) {
-
-        Cursor cursor = null;
-        String result = null;
-        final String column = "_data";
-        final String[] projection = {
-                column
-        };
-
-        try {
-            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs,
-                    null);
-            if (cursor != null && cursor.moveToFirst()) {
-                final int index = cursor.getColumnIndexOrThrow(column);
-                result = cursor.getString(index);
-            }
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            return null;
-        } finally {
-            if (cursor != null)
-                cursor.close();
-        }
-        return result;
-    }
-
-
-    /**
-     * @param uri The Uri to check.
-     * @return Whether the Uri authority is ExternalStorageProvider.
-     */
-    public static boolean isExternalStorageDocument(Uri uri) {
-        return "com.android.externalstorage.documents".equals(uri.getAuthority());
-    }
-
-    /**
-     * @param uri The Uri to check.
-     * @return Whether the Uri authority is DownloadsProvider.
-     */
-    public static boolean isDownloadsDocument(Uri uri) {
-        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
-    }
-
-    /**
-     * @param uri The Uri to check.
-     * @return Whether the Uri authority is MediaProvider.
-     */
-    public static boolean isMediaDocument(Uri uri) {
-        return "com.android.providers.media.documents".equals(uri.getAuthority());
-    }
-
-    /**
-     * @param uri The Uri to check.
-     * @return Whether the Uri authority is Google Photos.
-     */
-    public static boolean isGooglePhotosUri(Uri uri) {
-        return "com.google.android.apps.photos.content".equals(uri.getAuthority());
-    }
-
-}
+package com.ReactNativeBlobUtil.Utils;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.DocumentsContract;
+import android.provider.MediaStore;
+import android.content.ContentUris;
+import android.content.ContentResolver;
+
+import com.ReactNativeBlobUtil.ReactNativeBlobUtilUtils;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.FileOutputStream;
+
+public class PathResolver {
+    @TargetApi(19)
+    public static String getRealPathFromURI(final Context context, final Uri uri) {
+
+        final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
+
+        // DocumentProvider
+        if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
+            // ExternalStorageProvider
+            if (isExternalStorageDocument(uri)) {
+                final String docId = DocumentsContract.getDocumentId(uri);
+                final String[] split = docId.split(":");
+                final String type = split[0];
+
+                if ("primary".equalsIgnoreCase(type)) {
+                    File dir = context.getExternalFilesDir(null);
+                    if (dir != null) return dir + "/" + split[1];
+                    return "";
+                }
+
+                // TODO handle non-primary volumes
+            }
+            // DownloadsProvider
+            else if (isDownloadsDocument(uri)) {
+                try {
+                    final String id = DocumentsContract.getDocumentId(uri);
+                    //Starting with Android O, this "id" is not necessarily a long (row number),
+                    //but might also be a "raw:/some/file/path" URL
+                    if (id != null && id.startsWith("raw:/")) {
+                        Uri rawuri = Uri.parse(id);
+                        String path = rawuri.getPath();
+                        return path;
+                    }
+
+                    Long docId = null;
+                    //Since Android 10, uri can start with msf scheme like "msf:12345"
+                    if (id != null && id.startsWith("msf:")) {
+                        final String[] split = id.split(":");
+                        docId = Long.valueOf(split[1]);
+                    } else {
+                        docId = Long.valueOf(id);
+                    }
+
+                    final Uri contentUri = ContentUris.withAppendedId(
+                            Uri.parse("content://downloads/public_downloads"), docId);
+                    return getDataColumn(context, contentUri, null, null);
+                } catch (Exception ex) {
+                    //something went wrong, but android should still be able to handle the original uri by returning null here (see readFile(...))
+                    return null;
+                }
+
+            }
+            // MediaProvider
+            else if (isMediaDocument(uri)) {
+                final String docId = DocumentsContract.getDocumentId(uri);
+                final String[] split = docId.split(":");
+                final String type = split[0];
+
+                Uri contentUri = null;
+                if ("image".equals(type)) {
+                    contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+                } else if ("video".equals(type)) {
+                    contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
+                } else if ("audio".equals(type)) {
+                    contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
+                }
+
+                final String selection = "_id=?";
+                final String[] selectionArgs = new String[]{
+                        split[1]
+                };
+
+                return getDataColumn(context, contentUri, selection, selectionArgs);
+            } else if ("content".equalsIgnoreCase(uri.getScheme())) {
+
+                // Return the remote address
+                if (isGooglePhotosUri(uri))
+                    return uri.getLastPathSegment();
+
+                return getDataColumn(context, uri, null, null);
+            }
+            // Other Providers
+            else {
+                try {
+                    InputStream attachment = context.getContentResolver().openInputStream(uri);
+                    if (attachment != null) {
+                        String filename = getContentName(context.getContentResolver(), uri);
+                        if (filename != null) {
+                            File file = new File(context.getCacheDir(), filename);
+                            FileOutputStream tmp = new FileOutputStream(file);
+                            byte[] buffer = new byte[1024];
+                            while (attachment.read(buffer) > 0) {
+                                tmp.write(buffer);
+                            }
+                            tmp.close();
+                            attachment.close();
+                            return file.getAbsolutePath();
+                        }
+                    }
+                } catch (Exception e) {
+                    ReactNativeBlobUtilUtils.emitWarningEvent(e.toString());
+                    return null;
+                }
+            }
+        }
+        // MediaStore (and general)
+        else if ("content".equalsIgnoreCase(uri.getScheme())) {
+
+            // Return the remote address
+            if (isGooglePhotosUri(uri))
+                return uri.getLastPathSegment();
+
+            return getDataColumn(context, uri, null, null);
+        }
+        // File
+        else if ("file".equalsIgnoreCase(uri.getScheme())) {
+            return uri.getPath();
+        }
+
+        return null;
+    }
+
+    private static String getContentName(ContentResolver resolver, Uri uri) {
+        Cursor cursor = resolver.query(uri, null, null, null, null);
+        cursor.moveToFirst();
+        int nameIndex = cursor.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME);
+        if (nameIndex >= 0) {
+            String name = cursor.getString(nameIndex);
+            cursor.close();
+            return name;
+        }
+        return null;
+    }
+
+    /**
+     * Get the value of the data column for this Uri. This is useful for
+     * MediaStore Uris, and other file-based ContentProviders.
+     *
+     * @param context       The context.
+     * @param uri           The Uri to query.
+     * @param selection     (Optional) Filter used in the query.
+     * @param selectionArgs (Optional) Selection arguments used in the query.
+     * @return The value of the _data column, which is typically a file path.
+     */
+    public static String getDataColumn(Context context, Uri uri, String selection,
+                                       String[] selectionArgs) {
+
+        Cursor cursor = null;
+        String result = null;
+        final String column = "_data";
+        final String[] projection = {
+                column
+        };
+
+        try {
+            cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs,
+                    null);
+            if (cursor != null && cursor.moveToFirst()) {
+                final int index = cursor.getColumnIndexOrThrow(column);
+                result = cursor.getString(index);
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return null;
+        } finally {
+            if (cursor != null)
+                cursor.close();
+        }
+        return result;
+    }
+
+
+    /**
+     * @param uri The Uri to check.
+     * @return Whether the Uri authority is ExternalStorageProvider.
+     */
+    public static boolean isExternalStorageDocument(Uri uri) {
+        return "com.android.externalstorage.documents".equals(uri.getAuthority());
+    }
+
+    /**
+     * @param uri The Uri to check.
+     * @return Whether the Uri authority is DownloadsProvider.
+     */
+    public static boolean isDownloadsDocument(Uri uri) {
+        return "com.android.providers.downloads.documents".equals(uri.getAuthority());
+    }
+
+    /**
+     * @param uri The Uri to check.
+     * @return Whether the Uri authority is MediaProvider.
+     */
+    public static boolean isMediaDocument(Uri uri) {
+        return "com.android.providers.media.documents".equals(uri.getAuthority());
+    }
+
+    /**
+     * @param uri The Uri to check.
+     * @return Whether the Uri authority is Google Photos.
+     */
+    public static boolean isGooglePhotosUri(Uri uri) {
+        return "com.google.android.apps.photos.content".equals(uri.getAuthority());
+    }
+
+}