Add error handler to android file response handler

Author: wkh237

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

@@ -198,8 +198,14 @@ public void fetchBlob(ReadableMap options, String taskId, String method, String
             AsyncHttpResponseHandler handler;
 
             // create handler
-            if(config.fileCache || config.path != null)
+            if(config.fileCache || config.path != null) {
                 handler = new RNFetchBlobFileHandler(this.getReactApplicationContext(), taskId, config, callback);
+                // if path format invalid, throw error
+                if (!((RNFetchBlobFileHandler)handler).isValid) {
+                    callback.invoke("RNFetchBlob fetch error, configuration path `"+ config.path  +"` is not a valid path.");
+                    return;
+                }
+            }
             else
                 handler = new RNFetchBlobBinaryHandler(this.getReactApplicationContext(), taskId, callback);
 
@@ -287,8 +293,14 @@ public void fetchBlobForm(ReadableMap options, String taskId, String method, Str
             AsyncHttpResponseHandler handler;
 
             // create handler
-            if(config.fileCache || config.path != null)
+            if(config.fileCache || config.path != null) {
                 handler = new RNFetchBlobFileHandler(this.getReactApplicationContext(), taskId, config, callback);
+                // if path format invalid, throw error
+                if (!((RNFetchBlobFileHandler)handler).isValid) {
+                    callback.invoke("RNFetchBlob fetch error, configuration path `"+ config.path  +"` is not a valid path.");
+                    return;
+                }
+            }
             else
                 handler = new RNFetchBlobBinaryHandler(this.getReactApplicationContext(), taskId, callback);
 

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

@@ -406,23 +406,15 @@ 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);
-//        }
-        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(null, true);
+        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);
         }
     }
 

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

@@ -21,6 +21,7 @@
  */
 public class RNFetchBlobFileHandler extends FileAsyncHttpResponseHandler {
 
+    public boolean isValid;
     Callback onResponse;
     ReactContext mCtx;
     String mTaskId;
@@ -32,6 +33,10 @@ public class RNFetchBlobFileHandler extends FileAsyncHttpResponseHandler {
         this.mTaskId = taskId;
         this.mConfig = config;
         this.mCtx = ctx;
+        if(!new File(RNFetchBlobFileHandler.getFilePath(ctx, taskId, config)).isFile()) {
+            this.isValid = false;
+        }
+        this.isValid = true;
     }
 
     static String getFilePath(ReactApplicationContext ctx, String taskId, RNFetchBlobConfig config) {

src/ios/RNFetchBlob/RNFetchBlob.m

@@ -574,6 +574,14 @@ - (id) init {
     return self;
 }
 
+- (NSDictionary *)constantsToExport
+{
+    return @{
+             @"DocumentDir": [FetchBlobFS getDocumentDir],
+             @"CacheDir" : [FetchBlobFS getCacheDir]
+            };
+}
+
 // Fetch blob data request
 RCT_EXPORT_METHOD(fetchBlobForm:(NSDictionary *)options
                   taskId:(NSString *)taskId

test/react-native-testkit/lib/test-context.js

@@ -3,7 +3,7 @@
 let tests: Array<TestCase> = []
 let RCTContext: ReactElement = null
 let props:any = {}
-let timeout = 8000
+let timeout = 30000
 
 export default class TestContext {
 

test/test-android.js

@@ -70,12 +70,7 @@ describe('MediaScanner tests ', (report, done) => {
     ])
   })
   .then(() => {
-    report(<Assert key="scan success" expect={true} actual={true}/>)
-    console.log(dirs)
-    for(let i in dirs) {
-      console.log(i)
-    }
-    console.log(dirs.DCIMDir)
+    report(<Assert key={`scan image success, there should be a new file in Picture app named "${filename}"`} expect={true} actual={true}/>)
     return RNFetchBlob
             .config({
               path : dirs.DCIMDir + '/beethoven-'+ Date.now() +'.mp3'
@@ -87,7 +82,10 @@ describe('MediaScanner tests ', (report, done) => {
       path : resp.path()
     }])
     .then(() => {
-      report(<Assert key="scan mp3 file success" expect={true} actual={true}/>)
+      report(<Assert
+        key={`scan mp3 file success, there exist a new file named "beethoven-${Date.now()}.mp3" in Music app`}
+        expect={true}
+        actual={true}/>)
       done()
     })
   })

test/test-fs.js

@@ -22,8 +22,11 @@ let { TEST_SERVER_URL, FILENAME, DROPBOX_TOKEN, styles, image } = prop()
 let dirs = RNFetchBlob.fs.dirs
 
 describe('Get storage folders', (report, done) => {
+  console.log(dirs)
   report(
-    <Assert key="system folders should exists" expect={resp} comparer={Comparer.exists} />,
+    <Assert key="system folders should exists"
+      expect={dirs}
+      comparer={Comparer.exists} />,
     <Assert key="check properties"
       expect={['DocumentDir', 'CacheDir']}
       comparer={Comparer.hasProperties}

test/test-init.js

@@ -18,7 +18,7 @@ const { Assert, Comparer, Info, describe, prop } = RNTest
 // test environment variables
 
 prop('FILENAME', `${Platform.OS}-0.5.0-${Date.now()}.png`)
-prop('TEST_SERVER_URL', 'http://192.168.0.14:8123')
+prop('TEST_SERVER_URL', 'http://192.168.16.70:8123')
 prop('DROPBOX_TOKEN', 'fsXcpmKPrHgAAAAAAAAAoXZhcXYWdgLpQMan6Tb_bzJ237DXhgQSev12hA-gUXt4')
 prop('styles', {
   image : {
@@ -52,7 +52,7 @@ describe('GET image from server', (report, done) => {
 })
 
 
-// require('./test-fs')
-// require('./test-0.1.x-0.4.x')
-// require('./test-0.5.x')
+require('./test-fs')
+require('./test-0.1.x-0.4.x')
+require('./test-0.5.x')
 require('./test-android')