Change media scanner interface

Author: wkh237

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

@@ -125,21 +125,19 @@ public void stat(String path, Callback callback) {
     }
 
     @ReactMethod
-    public void scanFile(ReadableMap pairs, Callback callback) {
-        ReadableMapKeySetIterator it = pairs.keySetIterator();
-        WritableArray path = Arguments.createArray();
-        WritableArray mimes = Arguments.createArray();
-        while(it.hasNextKey()) {
-            String key = pairs.keySetIterator().nextKey();
-            path.pushString(key);
-            String mime = pairs.getString(key);
-            mimes.pushString(mime);
-        }
-        String [] p = new String[path.size()];
-        String [] m = new String[path.size()];
-        for(int i =0;i<path.size();i++) {
-            p[i] = path.getString(i);
-            m[i] = mimes.getString(i);
+    public void scanFile(ReadableArray pairs, Callback callback) {
+        int size = pairs.size();
+        String [] p = new String[size];
+        String [] m = new String[size];
+        for(int i=0;i<size;i++) {
+            ReadableMap pair = pairs.getMap(i);
+            if(pair.hasKey("path")) {
+                p[i] = pair.getString("path");
+                if(pair.hasKey("mime"))
+                    m[i] = pair.getString("mime");
+                else
+                    m[i] = null;
+            }
         }
         new RNFetchBlobFS(this.getReactApplicationContext()).scanFile(p, m, callback);
     }

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

@@ -1,5 +1,6 @@
 package com.RNFetchBlob;
 
+import android.content.Intent;
 import android.media.MediaScannerConnection;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -414,15 +415,23 @@ static void stat(String path, Callback callback) {
     }
 
     void scanFile(String [] path, String[] mimes, final Callback callback) {
-        try {
-            MediaScannerConnection.scanFile(mCtx, path, mimes, new MediaScannerConnection.OnScanCompletedListener() {
-                @Override
-                public void onScanCompleted(String s, Uri uri) {
-                    callback.invoke(null, true);
-                }
-            });
-        } catch(Exception err) {
-            callback.invoke(err.getLocalizedMessage(), null);
+//        try {
+//            MediaScannerConnection.scanFile(mCtx, path, mimes, new MediaScannerConnection.OnScanCompletedListener() {
+//                @Override
+//                public void onScanCompleted(String s, Uri uri) {
+//                    callback.invoke(null, true);
+//                }
+//            });
+//        } catch(Exception err) {
+//            callback.invoke(err.getLocalizedMessage(), null);
+//        }
+        for(String p : path) {
+            File file = new File(p);
+            Uri uri = Uri.fromFile(file);
+            Intent scanFileIntent = new Intent(
+                    Intent.ACTION_MEDIA_SCANNER_SCAN_FILE, uri);
+            mCtx.sendBroadcast(scanFileIntent);
+            callback.invoke();
         }
     }
 

src/fs.js

@@ -175,15 +175,12 @@ function stat(path:string):Promise<RNFetchBlobFile> {
 
 /**
  * Android only method, request media scanner to scan the file.
- * @param  {Array<string>} paths Paths of files to be scanned.
- * @param  {Array<string>} mimes Optional array of MIME types for each path.
- *                               If mimeType is null, then the mimeType will be
- *                               inferred from the file extension.
+ * @param  {Array<Object<string, string>>} Array contains Key value pairs with key `path` and `mime`.
  * @return {Promise}
  */
-function scanFile(paths:Array<string>, mimes: Array<string>):Promise {
+function scanFile(pairs:any):Promise {
   return new Promise((resolve, reject) => {
-    RNFetchBlob.scanFile(path, (err) => {
+    RNFetchBlob.scanFile(pairs, (err) => {
       if(err)
         reject(err)
       else