Fix Fetch Replacement progress and cancel task issue wkh237#370

Author: wkh237

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

@@ -1,6 +1,7 @@
 package com.RNFetchBlob;
 
 import android.app.Activity;
+import android.app.DownloadManager;
 import android.content.Intent;
 import android.net.Uri;
 
@@ -341,4 +342,31 @@ public void getContentIntent(String mime, Promise promise) {
 
     }
 
+    @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());
+        }
+
+    }
+
 }

polyfill/Fetch.js

@@ -57,24 +57,38 @@ class RNFetchBlobFetchPolyfill {
       // task is a progress reportable and cancellable Promise, however,
       // task.then is not, so we have to extend task.then with progress and
       // cancel function
-      let task = promise
+      let progressHandler, uploadHandler, cancelHandler
+      let statefulPromise = promise
           .then((body) => {
-            return RNFetchBlob.config(config)
-            .fetch(options.method, url, options.headers, body)
+            let task = RNFetchBlob.config(config)
+              .fetch(options.method, url, options.headers, body)
+            if(progressHandler)
+              task.progress(progressHandler)
+            if(uploadHandler)
+              task.uploadProgress(uploadHandler)
+            if(cancelHandler)
+              task.cancel()
+            return task.then((resp) => {
+              log.verbose('response', resp)
+              // release blob cache created when sending request
+              if(blobCache !== null && blobCache instanceof Blob)
+                blobCache.close()
+              return Promise.resolve(new RNFetchBlobFetchRepsonse(resp))
+            })
           })
 
-      let statefulPromise = task.then((resp) => {
-        log.verbose('response', resp)
-        // release blob cache created when sending request
-        if(blobCache !== null && blobCache instanceof Blob)
-          blobCache.close()
-        return Promise.resolve(new RNFetchBlobFetchRepsonse(resp))
-      })
-
       // extend task.then progress with report and cancelling functions
-      statefulPromise.cancel = task.cancel
-      statefulPromise.progress = task.progress
-      statefulPromise.uploadProgress = task.uploadProgress
+      statefulPromise.progress = (fn) => {
+        progressHandler = fn
+      }
+      statefulPromise.uploadProgress = (fn) => {
+        uploadHandler = fn
+      }
+      statefulPromise.cancel = () => {
+        cancelHandler = true
+        if(task.cancel)
+          task.cancel()
+      }
 
       return statefulPromise