升级版本

Author: windwang

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

README.md

@@ -242,7 +242,7 @@ RNFetchBlob
 
 **Use Specific File Path**
 
-If you prefer a particular file path rather than randomly generated one, you can use `path` option. We've added [several  constants](#user-content-dirs) in v0.5.0 which represents commonly used directories.
+If you prefer a particular file path rather than randomly generated one, you can use `path` option. We've added [several  constants](https://github.com/wkh237/react-native-fetch-blob/wiki/File-System-Access-API#dirs) in v0.5.0 which represents commonly used directories.
 
 ```js
 let dirs = RNFetchBlob.fs.dirs
@@ -771,7 +771,7 @@ If you're going to concatenate files, you don't have to read the data to JS cont
 ## Caveats
 
 * This library does not urlencode unicode characters in URL automatically, see [#146](https://github.com/wkh237/react-native-fetch-blob/issues/146).
-* When a `Blob` ,  from existing file, the file **WILL BE REMOVE** if you `close` the blob.
+* When you create a `Blob` ,  from an existing file, the file **WILL BE REMOVED** if you `close` the blob.
 * If you replaced `window.XMLHttpRequest` for some reason (e.g. make Firebase SDK work), it will also affect how official `fetch` works (basically it should work just fine).
 * When file stream and upload/download progress event slow down your app, consider an upgrade to `0.9.6+`, use [additional arguments](https://github.com/wkh237/react-native-fetch-blob/wiki/Fetch-API#fetchprogressconfig-eventlistenerpromisernfetchblobresponse) to limit its frequency.
 * When passing a file path to the library, remove `file://` prefix.

android.js

@@ -21,10 +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.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
+  actionViewIntent,
+  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,9 +1,11 @@
 package com.RNFetchBlob;
 
+import android.app.Activity;
+import android.app.DownloadManager;
 import android.content.Intent;
 import android.net.Uri;
 
-import com.RNFetchBlob.Utils.RNFBCookieJar;
+import com.facebook.react.bridge.ActivityEventListener;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.Promise;
@@ -12,28 +14,64 @@
 import com.facebook.react.bridge.ReactMethod;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableArray;
+
+// Cookies
 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;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import static android.app.Activity.RESULT_OK;
+import static com.RNFetchBlob.RNFetchBlobConst.GET_CONTENT_INTENT;
+
 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);
     static LinkedBlockingQueue<Runnable> fsTaskQueue = new LinkedBlockingQueue<>();
     static ThreadPoolExecutor fsThreadPool = new ThreadPoolExecutor(2, 10, 5000, TimeUnit.MILLISECONDS, taskQueue);
     static public boolean ActionViewVisible = false;
+    static HashMap<Integer, Promise> promiseTable = new HashMap<>();
 
     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
+            public void onActivityResult(Activity activity, int requestCode, int resultCode, Intent data) {
+                if(requestCode == GET_CONTENT_INTENT && resultCode == RESULT_OK) {
+                    Uri d = data.getData();
+                    promiseTable.get(GET_CONTENT_INTENT).resolve(d.toString());
+                    promiseTable.remove(GET_CONTENT_INTENT);
+                }
+            }
+
+            @Override
+            public void onNewIntent(Intent intent) {
+
+            }
+        });
     }
 
     @Override
@@ -228,35 +266,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
@@ -314,12 +323,51 @@ 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
+    public void getContentIntent(String mime, Promise promise) {
+        Intent i = new Intent(Intent.ACTION_GET_CONTENT);
+        if(mime != null)
+            i.setType(mime);
+        else
+            i.setType("*/*");
+        promiseTable.put(GET_CONTENT_INTENT, promise);
+        this.getReactApplicationContext().startActivityForResult(i, GET_CONTENT_INTENT, null);
+
+    }
+
+    @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/RNFetchBlobConst.java

@@ -13,5 +13,6 @@ public class RNFetchBlobConst {
     public static final String RNFB_RESPONSE_BASE64 = "base64";
     public static final String RNFB_RESPONSE_UTF8  = "utf8";
     public static final String RNFB_RESPONSE_PATH  = "path";
+    public static final Integer GET_CONTENT_INTENT = 99900;
 
 }

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

@@ -203,6 +203,7 @@ static public Map<String, Object> getSystemfolders(ReactApplicationContext ctx)
         state = Environment.getExternalStorageState();
         if (state.equals(Environment.MEDIA_MOUNTED)) {
             res.put("SDCardDir", Environment.getExternalStorageDirectory().getAbsolutePath());
+            res.put("SDCardApplicationDir", ctx.getExternalFilesDir(null).getParentFile().getAbsolutePath());
         }
         res.put("MainBundleDir", ctx.getApplicationInfo().dataDir);
         return res;
@@ -234,7 +235,8 @@ public void readStream(String path, String encoding, int bufferSize, int tick, f
 
             InputStream fs;
             if(path.startsWith(RNFetchBlobConst.FILE_PREFIX_BUNDLE_ASSET)) {
-                fs = RNFetchBlob.RCTContext.getAssets().open(path.replace(RNFetchBlobConst.FILE_PREFIX_BUNDLE_ASSET, ""));
+                fs = RNFetchBlob.RCTContext.getAssets()
+                        .open(path.replace(RNFetchBlobConst.FILE_PREFIX_BUNDLE_ASSET, ""));
             }
             else {
                 fs = new FileInputStream(new File(path));
@@ -248,9 +250,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);
@@ -292,7 +292,8 @@ public void readStream(String path, String encoding, int bufferSize, int tick, f
             buffer = null;
 
         } catch (Exception err) {
-            emitStreamEvent(streamId, "error", "Failed to convert data to "+encoding+" encoded string, this might due to the source data is not able to convert using this encoding.");
+            emitStreamEvent(streamId, "warn", "Failed to convert data to "+encoding+" encoded string, this might due to the source data is not able to convert using this encoding.");
+            err.printStackTrace();
         }
     }
 
@@ -878,13 +879,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;
         }