react-native-blob-util 0.13.14 → 0.13.18

package/README.md

@@ -81,6 +81,11 @@ After `0.10.3` you can install this package directly from Github
 # replace <branch_name> with any one of the branches
 npm install --save github:RonRadtke/react-native-blob-util#<branch_name>
 ```
+**Okhttp**
+
+For using the library okhttp3 is required. It's in general included in react-native.
+The library uses the okhttp version shipped with react-native or used by your app.
+For very old devices android devices okhttp 3.12 can be used.
 
 **Manually Link Native Modules**
 
@@ -646,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 = ''

package/android/build.gradle

@@ -1,5 +1,5 @@
 apply plugin: 'com.android.library'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
@@ -50,53 +50,31 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    lintOptions {
+        abortOnError false
+    }
     productFlavors {
     }
 }
 
 dependencies {
     implementation "com.facebook.react:react-native:${safeExtGet('reactNativeVersion', '+')}"
-    implementation 'com.squareup.okhttp3:okhttp:3.12.+'
-    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.+'
-    implementation 'com.squareup.okhttp3:okhttp-urlconnection:3.12.+'
 }
 
-def configureReactNativePom(def pom) {
-    def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text)
-
-    pom.project {
-        name packageJson.title
-        artifactId packageJson.name
-        version = packageJson.version
-        group = "com.ReactNativeBlobUtil"
-        description packageJson.description
-        url packageJson.repository.baseUrl
-
-        licenses {
-            license {
-                name packageJson.license
-                url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename
-                distribution 'repo'
-            }
-        }
-
-        developers {
-            developer {
-                id packageJson.author.username
-                name packageJson.author.name
-            }
-        }
+afterEvaluate { project ->
+    // do this only when building this lib alone as a root project
+    if (project != rootProject) {
+        return
     }
-}
 
-afterEvaluate { project ->
     // some Gradle build hooks ref:
     // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html
     task androidJavadoc(type: Javadoc) {
         source = android.sourceSets.main.java.srcDirs
-        classpath += files(android.bootClasspath)
-        classpath += files(project.getConfigurations().getByName('compile').asList())
-        include '**/*.java'
+        classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+        classpath += files(android.libraryVariants.collect { variant ->
+            variant.javaCompileProvider.get().classpath.files
+        })
     }
 
     task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) {
@@ -106,8 +84,7 @@ afterEvaluate { project ->
 
     task androidSourcesJar(type: Jar) {
         classifier = 'sources'
-        from android.sourceSets.main.java.srcDirs
-        include '**/*.java'
+        from android.sourceSets.main.java.sourceFiles
     }
 
     android.libraryVariants.all { variant ->
@@ -124,12 +101,41 @@ afterEvaluate { project ->
         archives androidJavadocJar
     }
 
-    task installArchives(type: Upload) {
-        configuration = configurations.archives
-        repositories.mavenDeployer {
-            // Deploy to react-native-event-bridge/maven, ready to publish to npm
-            repository url: "file://${projectDir}/../android/maven"
-            configureReactNativePom pom
+    publishing {
+        publications {
+            mavenJava(MavenPublication) {
+                def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text)
+
+                artifactId packageJson.name
+                groupId = "com.ReactNativeBlobUtil"
+                version = packageJson.version
+
+                pom {
+                    name = packageJson.title
+                    description = packageJson.description
+                    url = packageJson.repository.baseUrl
+
+                    licenses {
+                        license {
+                            name = packageJson.license
+                            url = packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename
+                            distribution = 'repo'
+                        }
+                    }
+
+                    developers {
+                        developer {
+                            id = packageJson.author.username
+                            name = packageJson.author.name
+                        }
+                    }
+                }
+            }
+        }
+        repositories {
+            maven {
+                url = "file://${projectDir}/../android/maven"
+            }
         }
     }
 }

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

@@ -118,37 +118,29 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
                     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() {

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

@@ -57,7 +57,7 @@ class ReactNativeBlobUtilFS {
 
             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 @@ class ReactNativeBlobUtilFS {
 
             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 @@ class ReactNativeBlobUtilFS {
 
             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;
                     }
@@ -1185,9 +1185,6 @@ class ReactNativeBlobUtilFS {
             return null;
         if (!path.matches("\\w+\\:.*"))
             return path;
-        if (path.startsWith("file://")) {
-            return path.replace("file://", "");
-        }
 
         Uri uri = Uri.parse(path);
         if (path.startsWith(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET)) {

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

@@ -398,8 +398,9 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
             clientBuilder.addInterceptor(new Interceptor() {
                 @Override
                 public Response intercept(@NonNull Chain chain) throws IOException {
+                    Response originalResponse = null;
                     try {
-                        Response originalResponse = chain.proceed(req);
+                        originalResponse = chain.proceed(req);
                         ResponseBody extended;
                         switch (responseType) {
                             case KeepInMemory:
@@ -428,12 +429,21 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                         return originalResponse.newBuilder().body(extended).build();
                     } catch (SocketException e) {
                         timeout = true;
+                        if (originalResponse != null) {
+                            originalResponse.close();
+                        }
                     } catch (SocketTimeoutException e) {
                         timeout = true;
+                        if (originalResponse != null) {
+                            originalResponse.close();
+                        }
                         //ReactNativeBlobUtilUtils.emitWarningEvent("ReactNativeBlobUtil error when sending request : " + e.getLocalizedMessage());
                     } catch (Exception ex) {
-
+                        if (originalResponse != null) {
+                            originalResponse.close();
+                        }
                     }
+
                     return chain.proceed(chain.request());
                 }
             });

package/fetch.js

@@ -259,7 +259,7 @@ export function fetch(...args: any): Promise {
                 if (options.path || options.fileCache || options.addAndroidDownloads
                     || options.key || options.auto && respInfo.respType === 'blob') {
                     if (options.session)
-                        session(options.session).add(data);
+                        fs.session(options.session).add(data);
                 }
                 respInfo.rnfbEncode = rawType;
                 resolve(new FetchBlobResponse(taskId, respInfo, data));

package/index.d.ts

@@ -392,9 +392,23 @@ export interface FS {
 
     slice(src: string, dest: string, start: number, end: number): Promise<void>;
     asset(path: string): string;
-    df(): Promise<{ free: number, total: number }>;
+    df(): Promise<RNFetchBlobDf>;
 }
 
+export interface RNFetchBlobDfIOS {
+    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;
@@ -509,7 +523,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>;
 
     /**
      * 

package/ios/ReactNativeBlobUtilReqBuilder.m

@@ -115,6 +115,7 @@
                 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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-blob-util",
-    "version": "0.13.14",
+    "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": {