Merge branch '0.10.5' into issue-287-wip

Author: wkh237

README.md

@@ -3,7 +3,6 @@
 
 
 A project committed to making file access and data transfer easier, efficient for React Native developers.
-
 > For Firebase Storage solution, please upgrade to latest version for best compatibility.
 
 ## Features
@@ -61,6 +60,12 @@ pod 'react-native-fetch-blob',
     :path => '../node_modules/react-native-fetch-blob'
 ```
 
+After `0.10.3` you can install this package directly from Github 
+
+```sh
+# replace <branch_name> with any one of the branches
+npm install --save github:wkh237/react-native-fetch-blob-package#<branch_name>
+```
 **Automatically Link Native Modules**
 
 For 0.29.2+ projects, simply link native packages via the following command because rnpm has been merged into react-native, you no longer need it.

android.js

@@ -24,7 +24,15 @@ function actionViewIntent(path:string, mime:string = 'text/plain') {
     return Promise.reject('RNFetchBlob.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.')
+}
+
 
 export default {
-  actionViewIntent
+  actionViewIntent,
+  getContentIntent
 }

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

@@ -1,9 +1,12 @@
 package com.RNFetchBlob;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
+import android.util.Log;
 
 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;
@@ -15,11 +18,16 @@
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 
+import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 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 {
 
     static ReactApplicationContext RCTContext;
@@ -28,12 +36,28 @@ public class RNFetchBlob extends ReactContextBaseJavaModule {
     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);
 
         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
@@ -322,4 +346,16 @@ public void fetchBlobForm(ReadableMap options, String taskId, String method, Str
         new RNFetchBlobReq(options, taskId, method, url, headers, null, body, 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);
+
+    }
+
 }

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

@@ -265,8 +265,9 @@ else if(resolved == null) {
                 while ((cursor = fs.read(buffer)) != -1) {
                     encoder.encode(ByteBuffer.wrap(buffer).asCharBuffer());
                     String chunk = new String(buffer);
-                    if(cursor != bufferSize)
+                    if(cursor != bufferSize) {
                         chunk = chunk.substring(0, cursor);
+                    }
                     emitStreamEvent(streamId, "data", chunk);
                     if(tick > 0)
                         SystemClock.sleep(tick);
@@ -308,7 +309,8 @@ else if(resolved == null) {
             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();
         }
     }
 

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

@@ -220,8 +220,8 @@ else if (value.equalsIgnoreCase("utf8"))
                             responseFormat = ResponseFormat.UTF8;
                     }
                     else {
-                        builder.header(key, value);
-                        mheaders.put(key, value);
+                        builder.header(key.toLowerCase(), value);
+                        mheaders.put(key.toLowerCase(), value);
                     }
                 }
             }
@@ -304,9 +304,9 @@ else if(cType.isEmpty()) {
             clientBuilder.addNetworkInterceptor(new Interceptor() {
                 @Override
                 public Response intercept(Chain chain) throws IOException {
-                        redirects.add(chain.request().url().toString());
-                        return chain.proceed(chain.request());
-                    }
+                    redirects.add(chain.request().url().toString());
+                    return chain.proceed(chain.request());
+                }
             });
             // Add request interceptor for upload progress event
             clientBuilder.addInterceptor(new Interceptor() {
@@ -500,32 +500,11 @@ private void done(Response resp) {
                     // It uses customized response body which is able to report download progress
                     // and write response data to destination path.
                     resp.body().bytes();
-
                 } catch (Exception ignored) {
 //                    ignored.printStackTrace();
                 }
                 this.destPath = this.destPath.replace("?append=true", "");
-
-                try {
-                    long expectedLength = resp.body().contentLength();
-                    // when response contains Content-Length, check if the stream length is correct
-                    if(expectedLength > 0) {
-                        long actualLength = new File(this.destPath).length();
-                        if(actualLength != expectedLength) {
-                            callback.invoke("RNFetchBlob failed to write data to storage : expected " + expectedLength + " bytes but got " + actualLength + " bytes", null);
-                        }
-                        else {
-                            callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_PATH, this.destPath);
-                        }
-                    }
-                    else {
-                        callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_PATH, this.destPath);
-                    }
-                }
-                catch (Exception err) {
-                    callback.invoke(err.getMessage());
-                    err.printStackTrace();
-                }
+                callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_PATH, this.destPath);
                 break;
             default:
                 try {
@@ -536,7 +515,7 @@ private void done(Response resp) {
                 break;
         }
 //        if(!resp.isSuccessful())
-            resp.body().close();
+        resp.body().close();
         releaseTaskResource();
     }
 
@@ -578,7 +557,7 @@ private WritableMap getResponseInfo(Response resp, boolean isBlobResp) {
         }
         WritableArray redirectList = Arguments.createArray();
         for(String r : redirects) {
-                redirectList.pushString(r);
+            redirectList.pushString(r);
         }
         info.putArray("redirects", redirectList);
         info.putMap("headers", headers);
@@ -629,7 +608,8 @@ private String getHeaderIgnoreCases(Headers headers, String field) {
     private String getHeaderIgnoreCases(HashMap<String,String> headers, String field) {
         String val = headers.get(field);
         if(val != null) return val;
-        return headers.get(field.toLowerCase()) == null ? "" : headers.get(field.toLowerCase());
+        String lowerCasedValue = headers.get(field.toLowerCase());
+        return lowerCasedValue == null ? "" : lowerCasedValue;
     }
 
     private void emitStateEvent(WritableMap args) {

index.js

@@ -220,9 +220,10 @@ function fetch(...args:any):Promise {
 
   // # 241 normalize null or undefined headers, in case nil or null string
   // pass to native context
-  _.each(headers, (h,i) =>  {
-    headers[i] = h || ''
-  });
+  headers = _.reduce(headers, (result, value, key) => {
+    result[key] = value || ''
+    return result
+  }, {});
 
   // fetch from file system
   if(URIUtil.isFileURI(url)) {

ios/RNFetchBlob/RNFetchBlob.m

@@ -80,10 +80,25 @@ - (NSDictionary *)constantsToExport
                   callback:(RCTResponseSenderBlock)callback)
 {
 
-    [RNFetchBlobReqBuilder buildMultipartRequest:options taskId:taskId method:method url:url headers:headers form:form onComplete:^(__weak NSURLRequest *req, long bodyLength) {
+    [RNFetchBlobReqBuilder buildMultipartRequest:options
+                                          taskId:taskId
+                                          method:method
+                                             url:url
+                                         headers:headers
+                                            form:form
+                                      onComplete:^(__weak NSURLRequest *req, long bodyLength)
+    {
+        // something went wrong when building the request body
+        if(req == nil)
+        {
+            callback(@[@"RNFetchBlob.fetchBlobForm failed to create request body"]);
+        }
         // send HTTP request
-        RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
-        [utils sendRequest:options contentLength:bodyLength bridge:self.bridge taskId:taskId withRequest:req callback:callback];
+        else
+        {
+            RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
+            [utils sendRequest:options contentLength:bodyLength bridge:self.bridge taskId:taskId withRequest:req callback:callback];
+        }
     }];
 
 }
@@ -97,10 +112,25 @@ - (NSDictionary *)constantsToExport
                   headers:(NSDictionary *)headers
                   body:(NSString *)body callback:(RCTResponseSenderBlock)callback)
 {
-    [RNFetchBlobReqBuilder buildOctetRequest:options taskId:taskId method:method url:url headers:headers body:body onComplete:^(NSURLRequest *req, long bodyLength) {
+    [RNFetchBlobReqBuilder buildOctetRequest:options
+                                      taskId:taskId
+                                      method:method
+                                         url:url
+                                     headers:headers
+                                        body:body
+                                  onComplete:^(NSURLRequest *req, long bodyLength)
+    {
+        // something went wrong when building the request body
+        if(req == nil)
+        {
+            callback(@[@"RNFetchBlob.fetchBlob failed to create request body"]);
+        }
         // send HTTP request
-        __block RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
-        [utils sendRequest:options contentLength:bodyLength bridge:self.bridge taskId:taskId withRequest:req callback:callback];
+        else
+        {
+            __block RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
+            [utils sendRequest:options contentLength:bodyLength bridge:self.bridge taskId:taskId withRequest:req callback:callback];
+        }
     }];
 }
 
@@ -394,10 +424,27 @@ - (NSDictionary *)constantsToExport
 }
 
 #pragma mark - fs.readFile
-RCT_EXPORT_METHOD(readFile:(NSString *)path encoding:(NSString *)encoding resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXPORT_METHOD(readFile:(NSString *)path
+                  encoding:(NSString *)encoding
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
 
-    [RNFetchBlobFS readFile:path encoding:encoding resolver:resolve rejecter:reject onComplete:nil];
+    [RNFetchBlobFS readFile:path encoding:encoding onComplete:^(id content, NSString * err) {
+        if(err != nil)
+        {
+            reject(@"RNFetchBlob failed to read file", err, nil);
+            return;
+        }
+        if(encoding == @"ascii")
+        {
+            resolve((NSMutableArray *)content);
+        }
+        else
+        {
+            resolve((NSString *)content);
+        }
+    }];
 }
 
 #pragma mark - fs.readStream

ios/RNFetchBlobFS.h

@@ -61,7 +61,7 @@
 + (void) exists:(NSString *) path callback:(RCTResponseSenderBlock)callback;
 + (void) writeFileArray:(NSString *)path data:(NSArray *)data append:(BOOL)append resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject;
 + (void) writeFile:(NSString *)path encoding:(NSString *)encoding data:(NSString *)data append:(BOOL)append resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject;
-+ (void) readFile:(NSString *)path encoding:(NSString *)encoding resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject onComplete:(void (^)(NSData * content))onComplete;
++ (void) readFile:(NSString *)path encoding:(NSString *)encoding onComplete:(void (^)(NSData * content, NSString * errMsg))onComplete;
 + (void) readAssetFile:(NSData *)assetUrl completionBlock:(void(^)(NSData * content))completionBlock failBlock:(void(^)(NSError * err))failBlock;
 + (void) slice:(NSString *)path
          dest:(NSString *)dest