Merge branch '0.10.3' into 0.11.0

Author: wkh237

.github/ISSUE_TEMPLATE

@@ -1,4 +1,5 @@
-Hi ! Thank you for reporting an issue, but we would like to remind you, we have a trouble shooting page in our wiki. You may want to take a look on that page or find issues tagged "trouble shooting" :p 
+Hi ! Thank you for reporting an issue, but we would like to remind you, we have a trouble shooting page in our wiki. 
+You may want to take a look on that page or find issues tagged "trouble shooting" :p 
 
 * please provide the version of installed library and RN project.
 * a sample code snippet/repository is very helpful to spotting the problem.

.github/PULL_REQUEST_TEMPLATE

@@ -1,5 +1,5 @@
 Thank you for making a pull request ! Just a gentle reminder :)
 
 1. If the PR is offering a feature please make the request to our "Feature Branch" 0.11.0
-2. Bug fix request to "Bug Fix Branch" 0.10.1
+2. Bug fix request to "Bug Fix Branch" 0.10.2
 3. Correct README.md can directly to master

CONTRIBUTORS.md

@@ -1,16 +1,21 @@
+960px <[email protected]>
 Andreas Amsenius <[email protected]>
 Arthur Ouaki <[email protected]>
 Binur Konarbai <[email protected]>
 Chris Sloey <[email protected]>
 Corentin Smith <[email protected]>
 Dmitry Petukhov <[email protected]>
+Dombi Soma Kristóf <[email protected]>
 Erik Smartt <[email protected]>
 Evgeniy Baraniuk <[email protected]>
 Frank van der Hoek <[email protected]>
 Juan B. Rodriguez <[email protected]>
 Kaishley <[email protected]>
+Martin Giachetti <[email protected]>
 Mike Monteith <[email protected]>
+Naoki AINOYA <[email protected]>
 Nguyen Cao Nhat Linh <[email protected]>
+Petter Hesselberg <[email protected]>
 Tim Suchanek <[email protected]>
 follower <[email protected]>
 francisco-sanchez-molina <[email protected]>

README.md

@@ -4,17 +4,17 @@
 
 A project committed to make file acess and data transfer easier, efficient for React Native developers.
 
-> If you're going to use github repo as npm dependency please use the [archive repository](https://github.com/wkh237/react-native-fetch-blob-package/releases/tag/v0.9.6).
+> If you're going to use github repo as npm dependency please visit the [archive repository](https://github.com/wkh237/react-native-fetch-blob-package/releases/tag/v0.9.6).
 
-> If you're using this library as Firebase Storage solution, please upgrade to 0.9.6 since XMLHttpRequest polyfill has way better compatibility than previous versions.
+> For Firebase Storage solution, please upgrade to latest version for best compatibility.
 
 ## Features
 - Transfer data directly from/to storage without BASE64 bridging
 - File API supports normal files, Asset files, and CameraRoll files
 - Native-to-native file manipulation API, reduce JS bridging performance loss
 - File stream support for dealing with large file
 - Blob, File, XMLHttpRequest polyfills that make browser-based library available in RN (experimental)
-- JSON stream supported base on [Oboe.js@jimhigson](https://github.com/jimhigson/oboe.js/)
+- JSON stream supported base on [Oboe.js](https://github.com/jimhigson/oboe.js/) @jimhigson
 
 ## TOC
 * [About](#user-content-about)
@@ -608,10 +608,10 @@ When calling `readStream` method, you have to `open` the stream, and start to re
 ```js
 let data = ''
 RNFetchBlob.fs.readStream(
-    // encoding, should be one of `base64`, `utf8`, `ascii`
-    'base64',
     // file path
     PATH_TO_THE_FILE,
+    // encoding, should be one of `base64`, `utf8`, `ascii`
+    'base64',
     // (optional) buffer size, default to 4096 (4095 for BASE64 encoded data)
     // when reading file in BASE64 encoding, buffer size must be multiples of 3.
     4095)

package.json

@@ -1,12 +1,12 @@
 {
   "name": "react-native-fetch-blob-dev-env",
   "description": "RNFB development environment, not dist package",
-  "version": "0.10.1-dev",
+  "version": "0.10.3-dev",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",
     "update-info": "sh scripts/contributors.sh",
-    "test": "sh ./scrips/test.sh"
+    "test": "sh ./scripts/test.sh"
   },
   "devDependencies": {
     "body-parser": "^1.15.0",
@@ -16,19 +16,24 @@
     "multer": "^1.1.0"
   },
   "contributors": [
+    "960px <[email protected]>",
     "Andreas Amsenius <[email protected]>",
     "Arthur Ouaki <[email protected]>",
     "Binur Konarbai <[email protected]>",
     "Chris Sloey <[email protected]>",
     "Corentin Smith <[email protected]>",
     "Dmitry Petukhov <[email protected]>",
+    "Dombi Soma Kristóf <[email protected]>",
     "Erik Smartt <[email protected]>",
     "Evgeniy Baraniuk <[email protected]>",
     "Frank van der Hoek <[email protected]>",
     "Juan B. Rodriguez <[email protected]>",
     "Kaishley <[email protected]>",
+    "Martin Giachetti <[email protected]>",
     "Mike Monteith <[email protected]>",
+    "Naoki AINOYA <[email protected]>",
     "Nguyen Cao Nhat Linh <[email protected]>",
+    "Petter Hesselberg <[email protected]>",
     "Tim Suchanek <[email protected]>",
     "follower <[email protected]>",
     "francisco-sanchez-molina <[email protected]>",

src/CONTRIBUTORS.md

@@ -0,0 +1,25 @@
+960px <[email protected]>
+Andreas Amsenius <[email protected]>
+Arthur Ouaki <[email protected]>
+Binur Konarbai <[email protected]>
+Chris Sloey <[email protected]>
+Corentin Smith <[email protected]>
+Dmitry Petukhov <[email protected]>
+Dombi Soma Kristóf <[email protected]>
+Erik Smartt <[email protected]>
+Evgeniy Baraniuk <[email protected]>
+Frank van der Hoek <[email protected]>
+Juan B. Rodriguez <[email protected]>
+Kaishley <[email protected]>
+Martin Giachetti <[email protected]>
+Mike Monteith <[email protected]>
+Naoki AINOYA <[email protected]>
+Nguyen Cao Nhat Linh <[email protected]>
+Petter Hesselberg <[email protected]>
+Tim Suchanek <[email protected]>
+follower <[email protected]>
+francisco-sanchez-molina <[email protected]>
+hhravn <[email protected]>
+kejinliang <[email protected]>
+pedramsaleh <[email protected]>
+smartt <[email protected]>

src/android.js

@@ -1,7 +1,6 @@
 // Copyright 2016 wkh237@github. All rights reserved.
 // Use of this source code is governed by a MIT-style license that can be
 // found in the LICENSE file.
-// @flow
 
 import {
   NativeModules,

src/android/src/main/AndroidManifest.xml

@@ -2,7 +2,6 @@
     package="com.RNFetchBlob">
 
     <application
-        android:allowBackup="true"
         android:label="@string/app_name"
         android:supportsRtl="true">
 

src/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java

@@ -14,6 +14,7 @@
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
 
 import java.util.Map;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -231,17 +232,32 @@ public void run() {
     @ReactMethod
     /**
      * Get cookies belongs specific host.
-     * @param host String host name.
+     * @param host String domain name.
      */
-    public void getCookies(String host, Promise promise) {
+    public void getCookies(String domain, Promise promise) {
         try {
-            WritableArray cookies = RNFBCookieJar.getCookies(host);
+            WritableMap cookies = RNFBCookieJar.getCookies(domain);
             promise.resolve(cookies);
         } catch(Exception err) {
             promise.reject("RNFetchBlob.getCookies", err.getMessage());
         }
     }
 
+    @ReactMethod
+    /**
+     * Remove cookies for specific domain
+     * @param domain String of the domain
+     * @param promise JSC promise injected by RN
+     */
+    public void removeCookies(String domain, Promise promise) {
+        try {
+            RNFBCookieJar.removeCookies(domain);
+            promise.resolve(null);
+        } catch(Exception err) {
+            promise.reject("RNFetchBlob.removeCookies", err.getMessage());
+        }
+    }
+
     @ReactMethod
     /**
      * @param path Stream file path

src/android/src/main/java/com/RNFetchBlob/RNFetchBlobConfig.java

@@ -19,6 +19,7 @@ public class RNFetchBlobConfig {
     public Boolean overwrite = true;
     public long timeout = 60000;
     public Boolean increment = false;
+    public Boolean followRedirect = true;
     public ReadableArray binaryContentTypes = null;
 
     RNFetchBlobConfig(ReadableMap options) {
@@ -36,9 +37,11 @@ public class RNFetchBlobConfig {
         if(this.path != null && path.toLowerCase().contains("?append=true")) {
             this.overwrite = false;
         }
-
         if(options.hasKey("overwrite"))
             this.overwrite = options.getBoolean("overwrite");
+        if(options.hasKey("followRedirect")) {
+            this.followRedirect = options.getBoolean("followRedirect");
+        }
         this.key = options.hasKey("key") ? options.getString("key") : null;
         this.mime = options.hasKey("contentType") ? options.getString("contentType") : null;
         this.increment = options.hasKey("increment") ? options.getBoolean("increment") : false;