Merge branch '0.10.6' of github.com:wkh237/react-native-fetch-blob into 0.10.6

Author: bcpclone

CONTRIBUTORS.md

@@ -1,24 +1,36 @@
 960px <pinovel@gmail.com>
 Andreas Amsenius <andreas@amsenius.se>
+Andrew Jack <me@andrewjack.uk>
 Arthur Ouaki <arthur.ouaki@gmail.com>
 Binur Konarbai <binur95@gmail.com>
+Bronco <heybronco@gmail.com>
 Chris Sloey <chris@addjam.com>
 Corentin Smith <corentin.smith@gmail.com>
 Dmitry Petukhov <dmitryvpetukhov@gmail.com>
 Dombi Soma Kristóf <dombis@sonrisa.hu>
 Erik Smartt <code@eriksmartt.com>
 Evgeniy Baraniuk <ev.baraniuk@gmail.com>
 Frank van der Hoek <frank.vanderhoek@gmail.com>
+Guy Blank <blank.guy@gmail.com>
+Jon San Miguel <sanmiguelje@gmail.com>
 Juan B. Rodriguez <jbrodriguez@gmail.com>
 Kaishley <kklingachetti@msn.com>
 Martin Giachetti <martin.giachetti@gmail.com>
+Max Gurela <maxpowa1@gmail.com>
 Mike Monteith <mike@mikemonteith.com>
 Naoki AINOYA <ainonic@gmail.com>
 Nguyen Cao Nhat Linh <nhatlinh95@gmail.com>
+Nick Pomfret <npomfret@users.noreply.github.com>
+Oliver <spendabuk@hotmail.com>
 Petter Hesselberg <petterh@microsoft.com>
+Reza Ghorbani <r.ghorbani.f@gmail.com>
+Steve Liles <steveliles@gmail.com>
 Tim Suchanek <tim.suchanek@gmail.com>
+Yonsh Lin <yonsh@live.com>
+atlanteh <atlanteh@gmail.com>
 follower <github@rancidbacon.com>
 francisco-sanchez-molina <psm1984@gmail.com>
+gferreyra91 <gferreyra91@gmail.com>
 hhravn <hhravn@gmail.com>
 kejinliang <kejinliang@users.noreply.github.com>
 pedramsaleh <spmact@yahoo.ca>

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

@@ -8,6 +8,11 @@
 import android.provider.MediaStore;
 import android.content.ContentUris;
 import android.os.Environment;
+import android.content.ContentResolver;
+import com.RNFetchBlob.RNFetchBlobUtils;
+import java.io.File;
+import java.io.InputStream;
+import java.io.FileOutputStream;
 
 public class PathResolver {
     public static String getRealPathFromURI(final Context context, final Uri uri) {
@@ -59,6 +64,29 @@ else if (isMediaDocument(uri)) {
 
                 return getDataColumn(context, contentUri, selection, selectionArgs);
             }
+            // Other Providers
+            else {
+                try {
+                    InputStream attachment = context.getContentResolver().openInputStream(uri);
+                    if (attachment != null) {
+                        String filename = getContentName(context.getContentResolver(), uri);
+                        if (filename != null) {
+                            File file = new File(context.getCacheDir(), filename);
+                            FileOutputStream tmp = new FileOutputStream(file);
+                            byte[] buffer = new byte[1024];
+                            while (attachment.read(buffer) > 0) {
+                                tmp.write(buffer);
+                            }
+                            tmp.close();
+                            attachment.close();
+                            return file.getAbsolutePath();
+                        }
+                    }
+                } catch (Exception e) {
+                    RNFetchBlobUtils.emitWarningEvent(e.toString());
+                    return null;
+                }
+            }
         }
         // MediaStore (and general)
         else if ("content".equalsIgnoreCase(uri.getScheme())) {
@@ -77,6 +105,18 @@ else if ("file".equalsIgnoreCase(uri.getScheme())) {
         return null;
     }
 
+    private static String getContentName(ContentResolver resolver, Uri uri) {
+        Cursor cursor = resolver.query(uri, null, null, null, null);
+        cursor.moveToFirst();
+        int nameIndex = cursor.getColumnIndex(MediaStore.MediaColumns.DISPLAY_NAME);
+        if (nameIndex >= 0) {
+            String name = cursor.getString(nameIndex);
+            cursor.close();
+            return name;
+        }
+        return null;
+    }
+
     /**
      * Get the value of the data column for this Uri. This is useful for
      * MediaStore Uris, and other file-based ContentProviders.

index.js

@@ -50,7 +50,6 @@ const RNFetchBlob = NativeModules.RNFetchBlob
 // their .expire event
 if(Platform.OS === 'ios') {
   AppState.addEventListener('change', (e) => {
-    console.log('app state changed', e)
     if(e === 'active')
       RNFetchBlob.emitExpiredEvent(()=>{})
   })

package.json

@@ -32,6 +32,7 @@
   "author": "wkh237 <xeiyan@gmail.com>",
   "license": "MIT",
   "contributors": [
+    "Ben <benhsieh@catchplay.com>",
     ""
   ]
-}
+}