Merge branch 'master' into 0.11.0

Author: wkh237

.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.6
+2. Bug fix request to "Bug Fix Branch" 0.10.7
 3. Correct README.md can directly to master

CONTRIBUTING.md

@@ -0,0 +1,7 @@
+For developers who interested in making contribution to this project, please see [https://github.com/wkh237/react-native-fetch-blob-dev](https://github.com/wkh237/react-native-fetch-blob-dev) for more information.
+
+Please read the following rules before opening a PR :
+
+1. If the PR is offering a feature please make the PR to our "Feature Branch" 0.11.0
+2. Bug fix request to "Bug Fix Branch" 0.10.6
+3. Correct README.md can directly to master

CONTRIBUTORS.md

@@ -1,24 +1,42 @@
 960px <[email protected]>
+Amerrnath <[email protected]>
 Andreas Amsenius <[email protected]>
+Andrew Jack <[email protected]>
 Arthur Ouaki <[email protected]>
+Ben <[email protected]>
+Ben Hsieh <[email protected]>
 Binur Konarbai <[email protected]>
+Bronco <[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]>
+Guy Blank <[email protected]>
+Jacob Lauritzen <[email protected]>
+Jeremi Stadler <[email protected]>
+Jon San Miguel <[email protected]>
 Juan B. Rodriguez <[email protected]>
 Kaishley <[email protected]>
 Martin Giachetti <[email protected]>
+Max Gurela <[email protected]>
 Mike Monteith <[email protected]>
 Naoki AINOYA <[email protected]>
 Nguyen Cao Nhat Linh <[email protected]>
+Nick Pomfret <[email protected]>
+Oliver <[email protected]>
 Petter Hesselberg <[email protected]>
+Reza Ghorbani <[email protected]>
+Simón Gómez <[email protected]>
+Steve Liles <[email protected]>
 Tim Suchanek <[email protected]>
+Yonsh Lin <[email protected]>
+atlanteh <[email protected]>
 follower <[email protected]>
 francisco-sanchez-molina <[email protected]>
+gferreyra91 <[email protected]>
 hhravn <[email protected]>
 kejinliang <[email protected]>
 pedramsaleh <[email protected]>

android.js

@@ -21,18 +21,26 @@ function actionViewIntent(path:string, mime:string = 'text/plain') {
   if(Platform.OS === 'android')
     return RNFetchBlob.actionViewIntent(path, mime)
   else
-    return Promise.reject('RNFetchBlob.actionViewIntent only supports Android.')
+    return Promise.reject('RNFetchBlob.android.actionViewIntent only supports Android.')
 }
 
 function getContentIntent(mime:string) {
   if(Platform.OS === 'android')
     return RNFetchBlob.getContentIntent(mime)
   else
-    return Promise.reject('RNFetchBlob.getContentIntent only supports Android.')
+    return Promise.reject('RNFetchBlob.android.getContentIntent only supports Android.')
+}
+
+function addCompleteDownload(config) {
+  if(Platform.OS === 'android')
+    return RNFetchBlob.addCompleteDownload(config)
+  else
+    return Promise.reject('RNFetchBlob.android.addCompleteDownload only supports Android.')
 }
 
 
 export default {
   actionViewIntent,
-  getContentIntent
+  getContentIntent,
+  addCompleteDownload
 }

android/build.gradle

@@ -6,10 +6,10 @@ repositories {
 
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 

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

@@ -1,6 +1,7 @@
 package com.RNFetchBlob;
 
 import android.app.Activity;
+import android.app.DownloadManager;
 import android.content.Intent;
 import android.net.Uri;
 import android.support.annotation.Nullable;
@@ -17,6 +18,11 @@
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.network.ForwardingCookieHandler;
+import com.facebook.react.modules.network.CookieJarContainer;
+import com.facebook.react.modules.network.OkHttpClientProvider;
+import okhttp3.OkHttpClient;
+import okhttp3.JavaNetCookieJar;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -29,6 +35,11 @@
 
 public class RNFetchBlob extends ReactContextBaseJavaModule {
 
+    // Cookies
+    private final ForwardingCookieHandler mCookieHandler;
+    private final CookieJarContainer mCookieJarContainer;
+    private final OkHttpClient mClient;
+
     static ReactApplicationContext RCTContext;
     static LinkedBlockingQueue<Runnable> taskQueue = new LinkedBlockingQueue<>();
     static ThreadPoolExecutor threadPool = new ThreadPoolExecutor(5, 10, 5000, TimeUnit.MILLISECONDS, taskQueue);
@@ -41,6 +52,11 @@ public RNFetchBlob(ReactApplicationContext reactContext) {
 
         super(reactContext);
 
+        mClient = OkHttpClientProvider.getOkHttpClient();
+        mCookieHandler = new ForwardingCookieHandler(reactContext);
+        mCookieJarContainer = (CookieJarContainer) mClient.cookieJar();
+        mCookieJarContainer.setCookieJar(new JavaNetCookieJar(mCookieHandler));
+
         RCTContext = reactContext;
         reactContext.addActivityEventListener(new ActivityEventListener() {
             @Override
@@ -251,35 +267,6 @@ public void run() {
 
     }
 
-    @ReactMethod
-    /**
-     * Get cookies belongs specific host.
-     * @param host String domain name.
-     */
-    public void getCookies(String domain, Promise promise) {
-        try {
-            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
@@ -370,12 +357,12 @@ public void enableUploadProgressReport(String taskId, int interval, int count) {
 
     @ReactMethod
     public void fetchBlob(ReadableMap options, String taskId, String method, String url, ReadableMap headers, String body, final Callback callback) {
-        new RNFetchBlobReq(options, taskId, method, url, headers, body, null, callback).run();
-    }
+        new RNFetchBlobReq(options, taskId, method, url, headers, body, null, mClient, callback).run();
+}
 
     @ReactMethod
     public void fetchBlobForm(ReadableMap options, String taskId, String method, String url, ReadableMap headers, ReadableArray body, final Callback callback) {
-        new RNFetchBlobReq(options, taskId, method, url, headers, null, body, callback).run();
+        new RNFetchBlobReq(options, taskId, method, url, headers, null, body, mClient, callback).run();
     }
 
     @ReactMethod
@@ -411,4 +398,31 @@ public void getContentIntent(String mime, Promise promise) {
 
     }
 
+    @ReactMethod
+    public void addCompleteDownload (ReadableMap config, Promise promise) {
+        DownloadManager dm = (DownloadManager) RNFetchBlob.RCTContext.getSystemService(RNFetchBlob.RCTContext.DOWNLOAD_SERVICE);
+        String path = RNFetchBlobFS.normalizePath(config.getString("path"));
+        if(path == null) {
+            promise.reject("RNFetchblob.addCompleteDownload can not resolve URI:" + config.getString("path"), "RNFetchblob.addCompleteDownload can not resolve URI:" + path);
+            return;
+        }
+        try {
+            WritableMap stat = RNFetchBlobFS.statFile(path);
+            dm.addCompletedDownload(
+                    config.hasKey("title") ? config.getString("title") : "",
+                    config.hasKey("description") ? config.getString("description") : "",
+                    true,
+                    config.hasKey("mime") ? config.getString("mime") : null,
+                    path,
+                    Long.valueOf(stat.getString("size")),
+                    config.hasKey("showNotification") && config.getBoolean("showNotification")
+            );
+            promise.resolve(null);
+        }
+        catch(Exception ex) {
+            promise.reject("RNFetchblob.addCompleteDownload failed", ex.getStackTrace().toString());
+        }
+
+    }
+
 }

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

@@ -258,10 +258,7 @@ public void readStream(String path, String encoding, int bufferSize, int tick, f
                 CharsetEncoder encoder = Charset.forName("UTF-8").newEncoder();
                 while ((cursor = fs.read(buffer)) != -1) {
                     encoder.encode(ByteBuffer.wrap(buffer).asCharBuffer());
-                    String chunk = new String(buffer);
-                    if(cursor != bufferSize) {
-                        chunk = chunk.substring(0, cursor);
-                    }
+                    String chunk = new String(buffer, 0, cursor);
                     emitStreamEvent(streamId, "data", chunk);
                     if(tick > 0)
                         SystemClock.sleep(tick);
@@ -896,13 +893,21 @@ static boolean isAsset(String path) {
         return false;
     }
 
+    /**
+     * Normalize the path, remove URI scheme (xxx://) so that we can handle it.
+     * @param path URI string.
+     * @return Normalized string
+     */
     static String normalizePath(String path) {
         if(path == null)
             return null;
-        Uri uri = Uri.parse(path);
-        if(uri.getScheme() == null) {
+        if(!path.matches("\\w+\\:.*"))
             return path;
+        if(path.startsWith("file://")) {
+            return path.replace("file://", "");
         }
+
+        Uri uri = Uri.parse(path);
         if(path.startsWith(RNFetchBlobConst.FILE_PREFIX_BUNDLE_ASSET)) {
             return path;
         }

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

@@ -12,7 +12,6 @@
 
 import com.RNFetchBlob.Response.RNFetchBlobDefaultResp;
 import com.RNFetchBlob.Response.RNFetchBlobFileResp;
-import com.RNFetchBlob.Utils.RNFBCookieJar;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -23,14 +22,12 @@
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.facebook.react.modules.network.OkHttpClientProvider;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.CookieHandler;
-import java.net.CookieManager;
-import java.net.CookiePolicy;
 import java.net.MalformedURLException;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
@@ -45,7 +42,6 @@
 
 import okhttp3.Call;
 import okhttp3.ConnectionPool;
-import okhttp3.CookieJar;
 import okhttp3.Headers;
 import okhttp3.Interceptor;
 import okhttp3.MediaType;
@@ -100,8 +96,9 @@ enum ResponseFormat {
     WritableMap respInfo;
     boolean timeout = false;
     ArrayList<String> redirects = new ArrayList<>();
+    OkHttpClient client;
 
-    public RNFetchBlobReq(ReadableMap options, String taskId, String method, String url, ReadableMap headers, String body, ReadableArray arrayBody, final Callback callback) {
+    public RNFetchBlobReq(ReadableMap options, String taskId, String method, String url, ReadableMap headers, String body, ReadableArray arrayBody, OkHttpClient client, final Callback callback) {
         this.method = method.toUpperCase();
         this.options = new RNFetchBlobConfig(options);
         this.taskId = taskId;
@@ -110,6 +107,7 @@ public RNFetchBlobReq(ReadableMap options, String taskId, String method, String
         this.callback = callback;
         this.rawRequestBody = body;
         this.rawRequestBodyArray = arrayBody;
+        this.client = client;
 
         if(this.options.fileCache || this.options.path != null)
             responseType = ResponseType.FileStorage;
@@ -234,9 +232,9 @@ else if(this.options.fileCache)
         try {
             // use trusty SSL socket
             if (this.options.trusty) {
-                clientBuilder = RNFetchBlobUtils.getUnsafeOkHttpClient();
+                clientBuilder = RNFetchBlobUtils.getUnsafeOkHttpClient(client);
             } else {
-                clientBuilder = new OkHttpClient.Builder();
+                clientBuilder = client.newBuilder();
             }
 
             final Request.Builder builder = new Request.Builder();
@@ -337,10 +335,7 @@ else if(cType.isEmpty()) {
             }
 
             // #156 fix cookie issue
-
-
             final Request req = builder.build();
-            clientBuilder.cookieJar(new RNFBCookieJar());
             clientBuilder.addNetworkInterceptor(new Interceptor() {
                 @Override
                 public Response intercept(Chain chain) throws IOException {

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

@@ -52,7 +52,7 @@ public static void emitWarningEvent(String data) {
                 .emit(RNFetchBlobConst.EVENT_MESSAGE, args);
     }
 
-    public static OkHttpClient.Builder getUnsafeOkHttpClient() {
+    public static OkHttpClient.Builder getUnsafeOkHttpClient(OkHttpClient client) {
         try {
             // Create a trust manager that does not validate certificate chains
             final TrustManager[] trustAllCerts = new TrustManager[]{
@@ -78,7 +78,7 @@ public java.security.cert.X509Certificate[] getAcceptedIssuers() {
             // Create an ssl socket factory with our all-trusting manager
             final SSLSocketFactory sslSocketFactory = sslContext.getSocketFactory();
 
-            OkHttpClient.Builder builder = new OkHttpClient.Builder();
+            OkHttpClient.Builder builder = client.newBuilder();
             builder.sslSocketFactory(sslSocketFactory);
             builder.hostnameVerifier(new HostnameVerifier() {
                 @Override

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

@@ -81,7 +81,6 @@ public long read(Buffer sink, long byteCount) throws IOException {
                 byte[] bytes = new byte[(int) byteCount];
                 long read = originalBody.byteStream().read(bytes, 0, (int) byteCount);
                 bytesDownloaded += read > 0 ? read : 0;
-                Log.i("bytes downloaded", String.valueOf(byteCount) + "/" + String.valueOf(read) + "=" + String.valueOf(bytesDownloaded));
                 if (read > 0) {
                     ofStream.write(bytes, 0, (int) read);
                 }