react-native-blob-util 0.16.2 → 0.16.4

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

@@ -28,6 +28,7 @@ import com.facebook.react.modules.network.ForwardingCookieHandler;
 import com.facebook.react.modules.network.OkHttpClientProvider;
 
 import java.io.File;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
@@ -88,7 +89,11 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
 
     @Override
     public Map<String, Object> getConstants() {
-        return ReactNativeBlobUtilFS.getSystemfolders(this.getReactApplicationContext());
+        Map<String, Object> res = new HashMap<>();
+        res.putAll(ReactNativeBlobUtilFS.getSystemfolders(this.getReactApplicationContext()));
+        res.putAll(ReactNativeBlobUtilFS.getLegacySystemfolders(this.getReactApplicationContext()));
+        System.out.println(res);
+        return res;
     }
 
     @ReactMethod
@@ -440,7 +445,7 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
     @ReactMethod
     public void writeToMediaFile(String fileUri, String path, boolean transformFile, Promise promise) {
         boolean res = ReactNativeBlobUtilMediaCollection.writeToMediaFile(Uri.parse(fileUri), path, transformFile, promise);
-        if(res) promise.resolve("Success");
+        if (res) promise.resolve("Success");
     }
 
     @RequiresApi(api = Build.VERSION_CODES.Q)
@@ -479,7 +484,7 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
         }
 
         boolean res = ReactNativeBlobUtilMediaCollection.writeToMediaFile(fileuri, path, false, promise);
-        if(res) promise.resolve(fileuri.toString());
+        if (res) promise.resolve(fileuri.toString());
     }
 
 }

package/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilFS.java

@@ -9,6 +9,8 @@ import android.os.Environment;
 import android.os.StatFs;
 import android.util.Base64;
 
+import androidx.annotation.NonNull;
+
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.Promise;
@@ -359,6 +361,34 @@ class ReactNativeBlobUtilFS {
         return res;
     }
 
+    /**
+     * Static method that returns legacy system folders to JS context (usage of deprecated functions since these retunr different folders)
+     *
+     * @param ctx React Native application context
+     */
+
+    @NonNull
+    @SuppressWarnings("deprecation")
+    static Map<String, Object> getLegacySystemfolders(ReactApplicationContext ctx) {
+        Map<String, Object> res = new HashMap<>();
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) return ReactNativeBlobUtilFS.getSystemfolders(ctx);
+
+        res.put("LegacyDCIMDir", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath());
+        res.put("LegacyPictureDir", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath());
+        res.put("LegacyMusicDir", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC).getAbsolutePath());
+        res.put("LegacyDownloadDir", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS).getAbsolutePath());
+        res.put("LegacyMovieDir", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES).getAbsolutePath());
+        res.put("LegacyRingtoneDir", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_RINGTONES).getAbsolutePath());
+
+        String state = Environment.getExternalStorageState();
+        if (state.equals(Environment.MEDIA_MOUNTED)) {
+            res.put("LegacySDCardDir", Environment.getExternalStorageDirectory().getAbsolutePath());
+        }
+
+        return res;
+    }
+
     static String getExternalFilesDirPath(ReactApplicationContext ctx, String type) {
         File dir = ctx.getExternalFilesDir(type);
         if (dir != null) return dir.getAbsolutePath();
@@ -809,7 +839,7 @@ class ReactNativeBlobUtilFS {
                 promise.reject("EINVAL", "Invalid algorithm '" + algorithm + "', must be one of md5, sha1, sha224, sha256, sha384, sha512");
                 return;
             }
-            
+
             path = ReactNativeBlobUtilUtils.normalizePath(path);
 
             File file = new File(path);

package/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilMediaCollection.java

@@ -69,11 +69,11 @@ public class ReactNativeBlobUtilMediaCollection {
             if (mt == MediaType.Download) return Environment.DIRECTORY_DOWNLOADS;
             return Environment.DIRECTORY_DOWNLOADS;
         } else {
-            if (mt == MediaType.Audio) return ReactNativeBlobUtilFS.getExternalFilesDirPath(ctx, Environment.DIRECTORY_MUSIC);
-            if (mt == MediaType.Video) return ReactNativeBlobUtilFS.getExternalFilesDirPath(ctx, Environment.DIRECTORY_MOVIES);
-            if (mt == MediaType.Image) return ReactNativeBlobUtilFS.getExternalFilesDirPath(ctx, Environment.DIRECTORY_PICTURES);
-            if (mt == MediaType.Download) return ReactNativeBlobUtilFS.getExternalFilesDirPath(ctx, Environment.DIRECTORY_DOWNLOADS);
-            return ReactNativeBlobUtilFS.getExternalFilesDirPath(ctx, Environment.DIRECTORY_DOWNLOADS);
+            if (mt == MediaType.Audio) return ReactNativeBlobUtilFS.getLegacySystemfolders(ctx).get("LegacyMusicDir").toString();
+            if (mt == MediaType.Video) return ReactNativeBlobUtilFS.getLegacySystemfolders(ctx).get("LegacyMovieDir").toString();
+            if (mt == MediaType.Image) return ReactNativeBlobUtilFS.getLegacySystemfolders(ctx).get("LegacyPictureDir").toString();
+            if (mt == MediaType.Download) return ReactNativeBlobUtilFS.getLegacySystemfolders(ctx).get("LegacyDownloadDir").toString();
+            return ReactNativeBlobUtilFS.getLegacySystemfolders(ctx).get("LegacyDownloadDir").toString();
         }
     }
 

package/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilReq.java

@@ -95,8 +95,8 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
 
     private boolean shouldTransformFile() {
         return this.options.transformFile &&
-            // Can only process if it's written to a file
-            (this.options.fileCache || this.options.path != null);
+                // Can only process if it's written to a file
+                (this.options.fileCache || this.options.path != null);
     }
 
     public static HashMap<String, Call> taskTable = new HashMap<>();
@@ -114,6 +114,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
     ReadableArray rawRequestBodyArray;
     ReadableMap headers;
     Callback callback;
+    Boolean callbackfired = false;
     long contentLength;
     long downloadManagerId;
     ReactNativeBlobUtilBody requestBody;
@@ -138,7 +139,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
 
         // If transformFile is specified, we first want to get the response back in memory so we can
         // encrypt it wholesale and at that point, write it into the file storage.
-        if((this.options.fileCache || this.options.path != null) && !this.shouldTransformFile())
+        if ((this.options.fileCache || this.options.path != null) && !this.shouldTransformFile())
             responseType = ResponseType.FileStorage;
         else
             responseType = ResponseType.KeepInMemory;
@@ -167,6 +168,12 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
         }
     }
 
+    private void invoke_callback(Object... args) {
+        if (this.callbackfired) return;
+        this.callback.invoke(args);
+        this.callbackfired = true;
+    }
+
     private final int QUERY = 1314;
     private ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(1);
     private Future<?> future;
@@ -290,7 +297,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
 
         // find cached result if `key` property exists
         String cacheKey = this.taskId;
-        String ext = this.options.appendExt.isEmpty() ? "" : "." + this.options.appendExt;
+        String ext = (this.options.appendExt == null || this.options.appendExt.isEmpty()) ? "" : "." + this.options.appendExt;
 
         if (this.options.key != null) {
             cacheKey = ReactNativeBlobUtilUtils.getMD5(this.options.key);
@@ -301,7 +308,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
             File file = new File(ReactNativeBlobUtilFS.getTmpPath(cacheKey) + ext);
 
             if (file.exists()) {
-                callback.invoke(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, file.getAbsolutePath());
+                invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, file.getAbsolutePath());
                 return;
             }
         }
@@ -355,7 +362,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                     }
 
                     if (!found) {
-                        callback.invoke("No available WiFi connections.", null, null);
+                        invoke_callback("No available WiFi connections.", null, null);
                         releaseTaskResource();
                         return;
                     }
@@ -395,7 +402,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
 
                 if (rawRequestBodyArray != null) {
                     requestType = RequestType.Form;
-                } else if (cType.isEmpty()) {
+                } else if (cType == null || cType.isEmpty()) {
                     if (!cType.equalsIgnoreCase("")) {
                         builder.header("Content-Type", "application/octet-stream");
                     }
@@ -551,9 +558,9 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                     // check if this error caused by socket timeout
                     if (e.getClass().equals(SocketTimeoutException.class)) {
                         respInfo.putBoolean("timeout", true);
-                        callback.invoke("The request timed out.", null, null);
+                        invoke_callback("The request timed out.", null, null);
                     } else
-                        callback.invoke(e.getLocalizedMessage(), null, null);
+                        invoke_callback(e.getLocalizedMessage(), null, null);
                     releaseTaskResource();
                 }
 
@@ -586,7 +593,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
         } catch (Exception error) {
             error.printStackTrace();
             releaseTaskResource();
-            callback.invoke("ReactNativeBlobUtil request error: " + error.getMessage() + error.getCause());
+            invoke_callback("ReactNativeBlobUtil request error: " + error.getMessage() + error.getCause());
         }
     }
 
@@ -631,7 +638,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                         ins.close();
                         os.flush();
                         os.close();
-                        callback.invoke(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, dest);
+                        invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, dest);
                     }
                     // response data directly pass to JS context as string.
                     else {
@@ -649,15 +656,15 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                             }
                             try (FileOutputStream fos = new FileOutputStream(file)) {
                                 fos.write(ReactNativeBlobUtilFileTransformer.sharedFileTransformer.onWriteFile(b));
-                            } catch(Exception e) {
-                                callback.invoke("Error from file transformer:" + e.getLocalizedMessage(), null);
+                            } catch (Exception e) {
+                                invoke_callback("Error from file transformer:" + e.getLocalizedMessage(), null);
                                 return;
                             }
-                            callback.invoke(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, this.destPath);
+                            invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, this.destPath);
                             return;
                         }
                         if (responseFormat == ResponseFormat.BASE64) {
-                            callback.invoke(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_BASE64, android.util.Base64.encodeToString(b, Base64.NO_WRAP));
+                            invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_BASE64, android.util.Base64.encodeToString(b, Base64.NO_WRAP));
                             return;
                         }
                         try {
@@ -667,21 +674,21 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                             decoder.decode(ByteBuffer.wrap(b));
                             // If the data contains invalid characters the following lines will be skipped.
                             String utf8 = new String(b, charSet);
-                            callback.invoke(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_UTF8, utf8);
+                            invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_UTF8, utf8);
                         }
                         // This usually means the data contains invalid unicode characters but still valid data,
                         // it's binary data, so send it as a normal string
                         catch (CharacterCodingException ignored) {
                             if (responseFormat == ResponseFormat.UTF8) {
                                 String utf8 = new String(b);
-                                callback.invoke(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_UTF8, utf8);
+                                invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_UTF8, utf8);
                             } else {
-                                callback.invoke(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_BASE64, android.util.Base64.encodeToString(b, Base64.NO_WRAP));
+                                invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_BASE64, android.util.Base64.encodeToString(b, Base64.NO_WRAP));
                             }
                         }
                     }
                 } catch (IOException e) {
-                    callback.invoke("ReactNativeBlobUtil failed to encode response data to BASE64 string.", null);
+                    invoke_callback("ReactNativeBlobUtil failed to encode response data to BASE64 string.", null);
                 }
                 break;
             case FileStorage:
@@ -713,26 +720,26 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                         } catch (IOException exception) {
                             exception.printStackTrace();
                         }
-                        callback.invoke("Unexpected FileStorage response file: " + responseBodyString, null);
+                        invoke_callback("Unexpected FileStorage response file: " + responseBodyString, null);
                     } else {
-                        callback.invoke("Unexpected FileStorage response with no file.", null);
+                        invoke_callback("Unexpected FileStorage response with no file.", null);
                     }
                     return;
                 }
 
                 if (ReactNativeBlobUtilFileResp != null && !ReactNativeBlobUtilFileResp.isDownloadComplete()) {
-                    callback.invoke("Download interrupted.", null);
+                    invoke_callback("Download interrupted.", null);
                 } else {
                     this.destPath = this.destPath.replace("?append=true", "");
-                    callback.invoke(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, this.destPath);
+                    invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, this.destPath);
                 }
 
                 break;
             default:
                 try {
-                    callback.invoke(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_UTF8, new String(resp.body().bytes(), "UTF-8"));
+                    invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_UTF8, new String(resp.body().bytes(), "UTF-8"));
                 } catch (IOException e) {
-                    callback.invoke("ReactNativeBlobUtil failed to encode response data to UTF8 string.", null);
+                    invoke_callback("ReactNativeBlobUtil failed to encode response data to UTF8 string.", null);
                 }
                 break;
         }
@@ -856,7 +863,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                 Cursor c = dm.query(query);
                 // #236 unhandled null check for DownloadManager.query() return value
                 if (c == null) {
-                    this.callback.invoke("Download manager failed to download from  " + this.url + ". Query was unsuccessful ", null, null);
+                    this.invoke_callback("Download manager failed to download from  " + this.url + ". Query was unsuccessful ", null, null);
                     return;
                 }
 
@@ -867,7 +874,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                         // #297 handle failed request
                         int statusCode = c.getInt(c.getColumnIndex(DownloadManager.COLUMN_STATUS));
                         if (statusCode == DownloadManager.STATUS_FAILED) {
-                            this.callback.invoke("Download manager failed to download from  " + this.url + ". Status Code = " + statusCode, null, null);
+                            this.invoke_callback("Download manager failed to download from  " + this.url + ". Status Code = " + statusCode, null, null);
                             return;
                         }
                         String contentUri = c.getString(c.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI));
@@ -896,17 +903,17 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                         if (!exists)
                             throw new Exception("Download manager download failed, the file does not downloaded to destination.");
                         else
-                            this.callback.invoke(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, customDest);
+                            this.invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, customDest);
 
                     } catch (Exception ex) {
                         ex.printStackTrace();
-                        this.callback.invoke(ex.getLocalizedMessage(), null);
+                        this.invoke_callback(ex.getLocalizedMessage(), null);
                     }
                 } else {
                     if (filePath == null)
-                        this.callback.invoke("Download manager could not resolve downloaded file path.", ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, null);
+                        this.invoke_callback("Download manager could not resolve downloaded file path.", ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, null);
                     else
-                        this.callback.invoke(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, filePath);
+                        this.invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, filePath);
                 }
 
             }

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

@@ -27,7 +27,7 @@ public class MimeType {
     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.isEmpty() || name.endsWith("." + "ext")) return name;
+        if ((ext == null || ext.isEmpty()) || name.endsWith("." + "ext")) return name;
         else {
             String fn = name + "." + ext;
             if (fn.endsWith(".")) return StringUtils.stripEnd(fn, ".");

package/fs.js

@@ -24,7 +24,15 @@ const dirs = {
     SDCardApplicationDir: ReactNativeBlobUtil.SDCardApplicationDir, // Deprecated
     MainBundleDir: ReactNativeBlobUtil.MainBundleDir,
     LibraryDir: ReactNativeBlobUtil.LibraryDir,
-  ApplicationSupportDir: ReactNativeBlobUtil.ApplicationSupportDir
+    ApplicationSupportDir: ReactNativeBlobUtil.ApplicationSupportDir,
+
+    LegacyPictureDir: ReactNativeBlobUtil.LegacyPictureDir,
+    LegacyMusicDir: ReactNativeBlobUtil.LegacyMusicDir,
+    LegacyMovieDir: ReactNativeBlobUtil.LegacyMovieDir,
+    LegacyDownloadDir: ReactNativeBlobUtil.LegacyDownloadDir,
+    LegacyDCIMDir: ReactNativeBlobUtil.LegacyDCIMDir,
+    LegacySDCardDir: ReactNativeBlobUtil.LegacySDCardDir, // Depracated
+
 };
 
 function addCode(code: string, error: Error): Error {

package/index.d.ts

@@ -481,6 +481,13 @@ export interface Dirs {
     DCIMDir: string;
     SDCardDir: string;
     MainBundleDir: string;
+
+    LegacyPictureDir: string;
+    LegacyMusicDir: string;
+    LegacyMovieDir: string;
+    LegacyDownloadDir: string;
+    LegacyDCIMDir: string;
+    LegacySDCardDir: string; // Depracated
 }
 
 export interface ReactNativeBlobUtilWriteStream {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-blob-util",
-    "version": "0.16.2",
+    "version": "0.16.4",
     "description": "A module provides upload, download, and files access API. Supports file stream read/write for process large files.",
     "main": "index.js",
     "scripts": {
@@ -8,7 +8,7 @@
     },
     "dependencies": {
         "base-64": "0.1.0",
-        "glob": "^7.1.6"
+        "glob": "^7.2.3"
     },
     "keywords": [
         "react-native",