react-native-blob-util 0.19.6 → 0.19.9

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

@@ -519,15 +519,15 @@ class ReactNativeBlobUtilFS {
      * @param callback JS context callback
      */
     static void cp(String path, String dest, Callback callback) {
-        path = ReactNativeBlobUtilUtils.normalizePath(path);
         dest = ReactNativeBlobUtilUtils.normalizePath(dest);
         InputStream in = null;
         OutputStream out = null;
         String message = "";
 
         try {
-            if (!isPathExists(path)) {
-                callback.invoke("Source file at path`" + path + "` does not exist");
+            in = inputStreamFromPath(path);
+            if (in == null) {
+                callback.invoke("Source file at path`" + path + "` does not exist or can not be opened");
                 return;
             }
             if (!new File(dest).exists()) {
@@ -538,7 +538,6 @@ class ReactNativeBlobUtilFS {
                 }
             }
 
-            in = inputStreamFromPath(path);
             out = new FileOutputStream(dest);
 
             byte[] buf = new byte[10240];
@@ -681,37 +680,36 @@ class ReactNativeBlobUtilFS {
      */
     static void slice(String path, String dest, int start, int end, String encode, Promise promise) {
         try {
-            path = ReactNativeBlobUtilUtils.normalizePath(path);
             dest = ReactNativeBlobUtilUtils.normalizePath(dest);
-            File source = new File(path);
-            if (source.isDirectory()) {
-                promise.reject("EISDIR", "Expecting a file but '" + path + "' is a directory");
-                return;
+
+            if (!path.startsWith(ReactNativeBlobUtilConst.FILE_PREFIX_CONTENT)) {
+                File file = new File(ReactNativeBlobUtilUtils.normalizePath(path));
+                if (file.isDirectory()) {
+                    promise.reject("EISDIR", "Expecting a file but '" + path + "' is a directory");
+                    return;
+                }
             }
-            if (!source.exists()) {
+
+            InputStream in = inputStreamFromPath(path);
+            if (in == null) {
                 promise.reject("ENOENT", "No such file '" + path + "'");
                 return;
             }
-            int size = (int) source.length();
-            int max = Math.min(size, end);
-            int expected = max - start;
-            int now = 0;
-            FileInputStream in = new FileInputStream(new File(path));
             FileOutputStream out = new FileOutputStream(new File(dest));
             int skipped = (int) in.skip(start);
             if (skipped != start) {
-                promise.reject("EUNSPECIFIED", "Skipped " + skipped + " instead of the specified " + start + " bytes, size is " + size);
+                promise.reject("EUNSPECIFIED", "Skipped " + skipped + " instead of the specified " + start + " bytes");
                 return;
             }
             byte[] buffer = new byte[10240];
-            while (now < expected) {
+            int remain = end - start;
+            while (remain > 0) {
                 int read = in.read(buffer, 0, 10240);
-                int remain = expected - now;
                 if (read <= 0) {
                     break;
                 }
                 out.write(buffer, 0, (int) Math.min(remain, read));
-                now += read;
+                remain -= read;
             }
             in.close();
             out.flush();
@@ -847,31 +845,27 @@ class ReactNativeBlobUtilFS {
                 return;
             }
 
-            path = ReactNativeBlobUtilUtils.normalizePath(path);
-
-            File file = new File(path);
-
-            if (file.isDirectory()) {
-                promise.reject("EISDIR", "Expecting a file but '" + path + "' is a directory");
-                return;
+            if (!path.startsWith(ReactNativeBlobUtilConst.FILE_PREFIX_CONTENT)) {
+                File file = new File(ReactNativeBlobUtilUtils.normalizePath(path));
+                if (file.isDirectory()) {
+                    promise.reject("EISDIR", "Expecting a file but '" + path + "' is a directory");
+                    return;
+                }
             }
 
-            if (!file.exists()) {
+            MessageDigest md = MessageDigest.getInstance(algorithms.get(algorithm));
+
+            InputStream inputStream = inputStreamFromPath(path);
+            if (inputStream == null) {
                 promise.reject("ENOENT", "No such file '" + path + "'");
                 return;
             }
-
-            MessageDigest md = MessageDigest.getInstance(algorithms.get(algorithm));
-
-            FileInputStream inputStream = new FileInputStream(path);
             int chunkSize = 4096 * 256; // 1Mb
             byte[] buffer = new byte[chunkSize];
 
-            if (file.length() != 0) {
-                int bytesRead;
-                while ((bytesRead = inputStream.read(buffer)) != -1) {
-                    md.update(buffer, 0, bytesRead);
-                }
+            int bytesRead;
+            while ((bytesRead = inputStream.read(buffer)) != -1) {
+                md.update(buffer, 0, bytesRead);
             }
 
             StringBuilder hexString = new StringBuilder();
@@ -1018,8 +1012,10 @@ class ReactNativeBlobUtilFS {
     }
 
     /**
-     * Get input stream of the given path, when the path is a string starts with bundle-assets://
-     * the stream is created by Assets Manager, otherwise use FileInputStream.
+     * Get input stream of the given path.
+     * When the path starts with bundle-assets:// the stream is created by Assets Manager
+     * When the path starts with content:// the stream is created by ContentResolver
+     * otherwise use FileInputStream.
      *
      * @param path The file to open stream
      * @return InputStream instance
@@ -1029,7 +1025,10 @@ class ReactNativeBlobUtilFS {
         if (path.startsWith(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET)) {
             return ReactNativeBlobUtilImpl.RCTContext.getAssets().open(path.replace(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET, ""));
         }
-        return new FileInputStream(new File(path));
+        if (path.startsWith(ReactNativeBlobUtilConst.FILE_PREFIX_CONTENT)) {
+            return ReactNativeBlobUtilImpl.RCTContext.getContentResolver().openInputStream(Uri.parse(path));
+        }
+        return new FileInputStream(new File(ReactNativeBlobUtilUtils.normalizePath(path)));
     }
 
     /**

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

@@ -678,7 +678,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                             try (FileOutputStream fos = new FileOutputStream(file)) {
                                 fos.write(ReactNativeBlobUtilFileTransformer.sharedFileTransformer.onWriteFile(b));
                             } catch (Exception e) {
-                                invoke_callback("Error from file transformer:" + e.getLocalizedMessage(), null);
+                                invoke_callback("Error from file transformer:" + e.getLocalizedMessage(),  respmap.copy());
                                 return;
                             }
                             invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, this.destPath, respmap.copy());
@@ -709,7 +709,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                         }
                     }
                 } catch (IOException e) {
-                    invoke_callback("ReactNativeBlobUtil failed to encode response data to BASE64 string.", null);
+                    invoke_callback("ReactNativeBlobUtil failed to encode response data to BASE64 string.", respmap.copy());
                 }
                 break;
             case FileStorage:
@@ -741,15 +741,15 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                         } catch (IOException exception) {
                             exception.printStackTrace();
                         }
-                        invoke_callback("Unexpected FileStorage response file: " + responseBodyString, null);
+                        invoke_callback("Unexpected FileStorage response file: " + responseBodyString,  respmap.copy());
                     } else {
-                        invoke_callback("Unexpected FileStorage response with no file.", null);
+                        invoke_callback("Unexpected FileStorage response with no file.",  respmap.copy());
                     }
                     return;
                 }
 
                 if (ReactNativeBlobUtilFileResp != null && !ReactNativeBlobUtilFileResp.isDownloadComplete()) {
-                    invoke_callback("Download interrupted.", null, respmap.copy());
+                    invoke_callback("Download interrupted.", respmap.copy());
                 } else {
                     this.destPath = this.destPath.replace("?append=true", "");
                     invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, this.destPath, respmap.copy());
@@ -760,7 +760,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                 try {
                     invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_UTF8, new String(resp.body().bytes(), "UTF-8"), respmap.copy());
                 } catch (IOException e) {
-                    invoke_callback("ReactNativeBlobUtil failed to encode response data to UTF8 string.", null);
+                    invoke_callback("ReactNativeBlobUtil failed to encode response data to UTF8 string.", respmap.copy());
                 }
                 break;
         }

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

@@ -148,11 +148,15 @@ public class ReactNativeBlobUtilStream {
      * @param callback Callback
      */
     void writeStream(String path, String encoding, boolean append, Callback callback) {
+        String resolved = ReactNativeBlobUtilUtils.normalizePath(path);
+        if (resolved != null)
+            path = resolved;
+
         try {
             File dest = new File(path);
             File dir = dest.getParentFile();
 
-            if (!dest.exists()) {
+            if (resolved != null && !dest.exists()) {
                 if (dir != null && !dir.exists()) {
                     if (!dir.mkdirs()) {
                         callback.invoke("ENOTDIR", "Failed to create parent directory of '" + path + "'");
@@ -168,7 +172,16 @@ public class ReactNativeBlobUtilStream {
                 return;
             }
 
-            OutputStream fs = new FileOutputStream(path, append);
+            OutputStream fs;
+            if (resolved != null && path.startsWith(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET)) {
+                fs = ReactNativeBlobUtilImpl.RCTContext.getAssets().openFd(path.replace(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET, "")).createOutputStream ();
+            }
+            // fix issue 287
+            else if (resolved == null) {
+                fs = ReactNativeBlobUtilImpl.RCTContext.getContentResolver().openOutputStream(Uri.parse(path));
+            } else {
+                fs = new FileOutputStream(path, append);
+            }
             this.encoding = encoding;
             String streamId = UUID.randomUUID().toString();
             ReactNativeBlobUtilStream.fileStreams.put(streamId, this);
@@ -274,20 +287,4 @@ public class ReactNativeBlobUtilStream {
         eventData.putString("streamId", streamName);
         this.emitter.emit(EVENT_FILESYSTEM, eventData);
     }
-
-    /**
-     * Get input stream of the given path, when the path is a string starts with bundle-assets://
-     * the stream is created by Assets Manager, otherwise use FileInputStream.
-     *
-     * @param path The file to open stream
-     * @return InputStream instance
-     * @throws IOException If the given file does not exist or is a directory FileInputStream will throw a FileNotFoundException
-     */
-    public static InputStream inputStreamFromPath(String path) throws IOException {
-        if (path.startsWith(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET)) {
-            return ReactNativeBlobUtilImpl.RCTContext.getAssets().open(path.replace(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET, ""));
-        }
-        return new FileInputStream(new File(path));
-    }
-
 }

package/fetch.js

@@ -260,6 +260,8 @@ export function fetch(...args: any): Promise {
             promise.cancel = () => {
             };
 
+            if(!responseInfo) responseInfo = {}; // should not be null / undefined
+
             if (err)
                 reject(new Error(err, respInfo));
             else {
@@ -269,9 +271,10 @@ export function fetch(...args: any): Promise {
                     if (options.session)
                         fs.session(options.session).add(data);
                 }
-                respInfo.rnfbEncode = rawType;
                 if ('uninit' in respInfo && respInfo.uninit) // event didn't fire yet so we override it here
                     respInfo = responseInfo;
+
+                respInfo.rnfbEncode = rawType;
                 resolve(new FetchBlobResponse(taskId, respInfo, data));
             }
 

package/ios/PrivacyInfo.xcprivacy

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array/>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>85F4.1</string>
+				<string>E174.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>0A2A.1</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>

package/ios/ReactNativeBlobUtil/ReactNativeBlobUtil.mm

@@ -788,7 +788,7 @@ RCT_EXPORT_METHOD(presentOptionsMenu:(NSString*)uri scheme:(NSString *)scheme re
                    resolve:(RCTPromiseResolveBlock)resolve
                     reject:(RCTPromiseRejectBlock)reject
 {
-    NSString * utf8uri = [uri stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSString * utf8uri = [uri stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     NSURL * url = [[NSURL alloc] initWithString:utf8uri];
     // NSURL * url = [[NSURL alloc] initWithString:uri];
     documentController = [UIDocumentInteractionController interactionControllerWithURL:url];
@@ -818,7 +818,7 @@ RCT_EXPORT_METHOD(presentOpenInMenu:(NSString*)uri scheme:(NSString *)scheme res
                   resolve:(RCTPromiseResolveBlock)resolve
                    reject:(RCTPromiseRejectBlock)reject
 {
-    NSString * utf8uri = [uri stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSString * utf8uri = [uri stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     NSURL * url = [[NSURL alloc] initWithString:utf8uri];
     documentController = [UIDocumentInteractionController interactionControllerWithURL:url];
     UIViewController *rootCtrl = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
@@ -848,7 +848,7 @@ RCT_EXPORT_METHOD(presentPreview:(NSString*)uri scheme:(NSString *)scheme resolv
                resolve:(RCTPromiseResolveBlock)resolve
                 reject:(RCTPromiseRejectBlock)reject
 {
-    NSString * utf8uri = [uri stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    NSString * utf8uri = [uri stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
     NSURL * url = [[NSURL alloc] initWithString:utf8uri];
     // NSURL * url = [[NSURL alloc] initWithString:uri];
     documentController = [UIDocumentInteractionController interactionControllerWithURL:url];

package/ios/ReactNativeBlobUtil.xcodeproj/project.pbxproj

@@ -53,6 +53,7 @@
 		A15C30111CD25C330074CB35 /* ReactNativeBlobUtil.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = ReactNativeBlobUtil.h; path = ReactNativeBlobUtil/ReactNativeBlobUtil.h; sourceTree = "<group>"; };
 		A19B48231D98100800E6868A /* ReactNativeBlobUtilProgress.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReactNativeBlobUtilProgress.h; sourceTree = "<group>"; };
 		A1AAE2971D300E3E0051D11C /* ReactNativeBlobUtilReqBuilder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ReactNativeBlobUtilReqBuilder.h; sourceTree = "<group>"; };
+		CBE41E482BB345A0004922E9 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
 		E83F89B1EFF498D9833537A4 /* Pods-ReactNativeBlobUtil.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ReactNativeBlobUtil.debug.xcconfig"; path = "Target Support Files/Pods-ReactNativeBlobUtil/Pods-ReactNativeBlobUtil.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -87,6 +88,7 @@
 		A15C30051CD25C330074CB35 = {
 			isa = PBXGroup;
 			children = (
+				CBE41E482BB345A0004922E9 /* PrivacyInfo.xcprivacy */,
 				11A307F22A06E47400E56674 /* ReactNativeBlobUtil */,
 				11A307F42A06E47500E56674 /* ReactNativeBlobUtilConst.mm */,
 				11A307F32A06E47400E56674 /* ReactNativeBlobUtilFileTransformer.mm */,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-blob-util",
-    "version": "0.19.6",
+    "version": "0.19.9",
     "description": "A module provides upload, download, and files access API. Supports file stream read/write for process large files.",
     "main": "index",
     "scripts": {

package/react-native-blob-util.podspec

@@ -13,6 +13,9 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/RonRadtke/react-native-blob-util" }
   s.author       = 'RonRadtke'
   s.source_files = 'ios/**/*.{h,m,mm,swift}'
+  s.resource_bundles = {
+    'ReactNativeBlobUtilPrivacyInfo' => ['ios/PrivacyInfo.xcprivacy'],
+  }
   s.platforms       = { :ios => "11.0" }
   s.framework    = 'AssetsLibrary'
 

package/android/proguard-rules.pro

@@ -1,17 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/xeiyan/Library/Android/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}