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

# Conflicts:
#	android/build.gradle
#	android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilReq.java

Author: Ron Radtke

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**
 

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,54 +50,27 @@ 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.+'
     implementation 'org.apache.commons:commons-lang3:3.0'
 }
 
-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 ->
     // 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) {
@@ -107,8 +80,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 ->
@@ -125,12 +97,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"
+            }
         }
     }
 }

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

@@ -392,8 +392,9 @@ public Response intercept(@NonNull Chain chain) throws IOException {
                 @NonNull
                 @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:
@@ -422,12 +423,21 @@ public Response intercept(@NonNull Chain chain) throws IOException {
                         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 ignored) {
-
+                    } catch (Exception ex) {
+                        if (originalResponse != null) {
+                            originalResponse.close();
+                        }
                     }
+
                     return chain.proceed(chain.request());
                 }
             });

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.json

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