Merge remote-tracking branch 'origin/develop' into feature/media_collections

# Conflicts:
#	android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilFS.java
#	index.d.ts

Author: Ron Radtke

README.md

@@ -651,7 +651,7 @@ In `v0.5.0` we've added  `writeStream` and `readStream`, which allows your app r
 
 When calling `readStream` method, you have to `open` the stream, and start to read data. When the file is large, consider using an appropriate `bufferSize` and `interval` to reduce the native event dispatching overhead (see [Performance Tips](#user-content-performance-tips))
 
-> The file stream event has a default throttle(10ms) and buffer size which preventing it cause too much overhead to main thread, yo can also [tweak these values](#user-content-performance-tips).
+> The file stream event has a default throttle(10ms) and buffer size which preventing it cause too much overhead to main thread, you can also [tweak these values](#user-content-performance-tips).
 
 ```js
 let data = ''

android/build.gradle

@@ -63,6 +63,11 @@ dependencies {
 }
 
 afterEvaluate { project ->
+    // do this only when building this lib alone as a root project
+    if (project != rootProject) {
+        return
+    }
+
     // some Gradle build hooks ref:
     // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
     task androidJavadoc(type: Javadoc) {

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

@@ -118,37 +118,29 @@ public void actionViewIntent(String path, String mime, @Nullable String chooserT
                     this.getReactApplicationContext().getPackageName() + ".provider", new File(path));
 
             Intent intent = new Intent(Intent.ACTION_VIEW);
-            if (Build.VERSION.SDK_INT >= 24) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 // Create the intent with data and type
                 intent.setDataAndType(uriForFile, mime);
-                if (chooserTitle != null) {
-                    intent = Intent.createChooser(intent, chooserTitle);
-                }
 
                 // Set flag to give temporary permission to external app to use FileProvider
                 intent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
                 // All the activity to be opened outside of an activity
                 intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-                // Validate that the device can open the file
-                PackageManager pm = getCurrentActivity().getPackageManager();
-                if (intent.resolveActivity(pm) != null) {
-                    this.getReactApplicationContext().startActivity(intent);
-                }
-
             } else {
                 intent.setDataAndType(Uri.parse("file://" + path), mime).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                if (chooserTitle != null) {
-                    intent = Intent.createChooser(intent, chooserTitle);
-                }
+            }
 
-                try {
-                    this.getReactApplicationContext().startActivity(intent);
-                    promise.resolve(true);
-                } catch (ActivityNotFoundException ex) {
-                    promise.reject("ENOAPP", "No app installed for " + mime);
-                }
+            if (chooserTitle != null) {
+                intent = Intent.createChooser(intent, chooserTitle);
             }
+
+            try {
+                this.getReactApplicationContext().startActivity(intent);
+                promise.resolve(true);
+            } catch (ActivityNotFoundException ex) {
+                promise.reject("ENOAPP", "No app installed for " + mime);
+            }
+
             ActionViewVisible = true;
 
             final LifecycleEventListener listener = new LifecycleEventListener() {

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

@@ -57,7 +57,7 @@ static void writeFile(String path, String encoding, String data, final boolean a
 
             if (!f.exists()) {
                 if (dir != null && !dir.exists()) {
-                    if (!dir.mkdirs()) {
+                    if (!dir.mkdirs() && !dir.exists()) {
                         promise.reject("EUNSPECIFIED", "Failed to create parent directory of '" + path + "'");
                         return;
                     }
@@ -129,7 +129,7 @@ static void writeFile(String path, ReadableArray data, final boolean append, fin
 
             if (!f.exists()) {
                 if (dir != null && !dir.exists()) {
-                    if (!dir.mkdirs()) {
+                    if (!dir.mkdirs() && !dir.exists()) {
                         promise.reject("ENOTDIR", "Failed to create parent directory of '" + path + "'");
                         return;
                     }
@@ -445,7 +445,7 @@ void writeStream(String path, String encoding, boolean append, Callback callback
 
             if (!dest.exists()) {
                 if (dir != null && !dir.exists()) {
-                    if (!dir.mkdirs()) {
+                    if (!dir.mkdirs() && !dir.exists()) {
                         callback.invoke("ENOTDIR", "Failed to create parent directory of '" + path + "'");
                         return;
                     }

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

@@ -598,7 +598,7 @@ private void done(Response resp) {
                 ReactNativeBlobUtilFileResp ReactNativeBlobUtilFileResp;
 
                 try {
-                    ReactNativeBlobUtilFileResp = (ReactNativeBlobUtilFileResp) responseBody;
+                    ReactNativeBlobUtilFileResp = new ReactNativeBlobUtilFileResp(responseBody);
                 } catch (ClassCastException ex) {
                     // unexpected response type
                     if (responseBody != null) {

android/src/main/java/com/ReactNativeBlobUtil/Response/ReactNativeBlobUtilFileResp.java

@@ -35,6 +35,11 @@ public class ReactNativeBlobUtilFileResp extends ResponseBody {
     FileOutputStream ofStream;
     boolean isEndMarkerReceived;
 
+    public ReactNativeBlobUtilFileResp(ResponseBody body) {
+        super();
+        this.originalBody = body;
+    }
+
     public ReactNativeBlobUtilFileResp(ReactApplicationContext ctx, String taskId, ResponseBody body, String path, boolean overwrite) throws IOException {
         super();
         this.rctContext = ctx;

index.d.ts

@@ -436,10 +436,23 @@ export interface FS {
     slice(src: string, dest: string, start: number, end: number): Promise<void>;
 
     asset(path: string): string;
+    df(): Promise<RNFetchBlobDf>;
+}
+
+export interface RNFetchBlobDfIOS {
+    free?: number;
+    total?: number;
+}
 
-    df(): Promise<{ free: number, total: number }>;
+export interface RNFetchBlobDfAndroid {
+    external_free?: string;
+    external_total?: string;
+    internal_free?: string;
+    internal_total?: string;
 }
 
+export type RNFetchBlobDf = RNFetchBlobDfIOS & RNFetchBlobDfAndroid;
+
 export interface Dirs {
     DocumentDir: string;
     CacheDir: string;
@@ -555,7 +568,7 @@ export interface AndroidApi {
      * @param mime Basically system will open an app according to this MIME type.
      * @param chooserTitle title for chooser, if not set the chooser won't be displayed (see [Android docs](https://developer.android.com/reference/android/content/Intent.html#createChooser(android.content.Intent,%20java.lang.CharSequence)))
      */
-    actionViewIntent(path: string, mime: string, chooserTitle?: string): Promise<any>;
+    actionViewIntent(path: string, mime: string, chooserTitle?: string): Promise<boolean | null>;
 
     /**
      *

ios/ReactNativeBlobUtilReqBuilder.m

@@ -115,6 +115,7 @@ +(void) buildOctetRequest:(NSDictionary *)options
                 if([body hasPrefix:FILE_PREFIX]) {
                     __block NSString * orgPath = [body substringFromIndex:[FILE_PREFIX length]];
                     orgPath = [ReactNativeBlobUtilFS getPathOfAsset:orgPath];
+                    orgPath = [[NSURL URLWithString:orgPath] path];
                     if([orgPath hasPrefix:AL_PREFIX])
                     {
 

package.json

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