brodcast receiver check taskId before resolving.

Author: pkwak-sf

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

@@ -698,36 +698,37 @@ public void onReceive(Context context, Intent intent) {
 
             }
         } else if (RNFetchBlobService.RNFetchBlobServiceBroadcast.equals(action)) {
-            if (intent.hasCategory(RNFetchBlobService.CategoryProgress)) {
-                HashMap map = (HashMap)intent.getSerializableExtra(RNFetchBlobService.BroadcastProgressMap);
-                String taskId = (String)map.get(RNFetchBlobService.KeyTaskId);
-                WritableMap args = Arguments.createMap();
-                args.putString("taskId", taskId);
-                args.putString("written", String.valueOf(map.get(RNFetchBlobService.KeyWritten)));
-                args.putString("total", String.valueOf(map.get(RNFetchBlobService.KeyTotal)));
-
-                // emit event to js context
-                RNFetchBlob.RCTContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                        .emit(RNFetchBlobConst.EVENT_UPLOAD_PROGRESS, args);
-            } else if (intent.hasCategory(RNFetchBlobService.CategorySuccess)) {
-                // Could be fail.
-                try {
-                    byte[] bytes = intent.getByteArrayExtra(RNFetchBlobService.BroadcastMsg);
-                    callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_UTF8, new String(bytes, "UTF-8"));
-                } catch (IOException e) {
-                    callback.invoke("RNFetchBlob failed to encode response data to UTF8 string.", null);
-                } finally {
-                    // lets unregister.
+            String _taskId = intent.getStringExtra(RNFetchBlobService.BroadcastTaskId);
+            if (this.taskId.equals(_taskId)) {
+                if (intent.hasCategory(RNFetchBlobService.CategoryProgress)) {
+                    HashMap map = (HashMap) intent.getSerializableExtra(RNFetchBlobService.BroadcastProgressMap);
+
+                    WritableMap args = Arguments.createMap();
+                    args.putString("taskId", _taskId);
+                    args.putString("written", String.valueOf(map.get(RNFetchBlobService.KeyWritten)));
+                    args.putString("total", String.valueOf(map.get(RNFetchBlobService.KeyTotal)));
+
+                    // emit event to js context
+                    RNFetchBlob.RCTContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                            .emit(RNFetchBlobConst.EVENT_UPLOAD_PROGRESS, args);
+                } else if (intent.hasCategory(RNFetchBlobService.CategorySuccess)) {
+                    // Could be fail.
+                    try {
+                        byte[] bytes = intent.getByteArrayExtra(RNFetchBlobService.BroadcastMsg);
+                        callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_UTF8, new String(bytes, "UTF-8"));
+                    } catch (IOException e) {
+                        callback.invoke("RNFetchBlob failed to encode response data to UTF8 string.", null);
+                    } finally {
+                        // lets unregister.
+                        Context appCtx = RNFetchBlob.RCTContext.getApplicationContext();
+                        appCtx.unregisterReceiver(this);
+                    }
+                } else if (intent.hasCategory(RNFetchBlobService.CategoryFail)) {
+                    callback.invoke("Request failed.", null, null);
                     Context appCtx = RNFetchBlob.RCTContext.getApplicationContext();
                     appCtx.unregisterReceiver(this);
                 }
-            } else if (intent.hasCategory(RNFetchBlobService.CategoryFail)) {
-                callback.invoke("Request failed.", null, null);
-                Context appCtx = RNFetchBlob.RCTContext.getApplicationContext();
-                appCtx.unregisterReceiver(this);
             }
         }
     }
-
-
 }

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

@@ -40,8 +40,8 @@ public class RNFetchBlobService extends IntentService implements ProgressListene
 
     public static String BroadcastMsg = "BroadcastMsg";
     public static String BroadcastProgressMap = "BroadcastProgressMap";
+    public static String BroadcastTaskId = "BroadcastTaskId";
 
-    public static String KeyTaskId = "KeyTaskId";
     public static String KeyWritten = "KeyWritten";
     public static String KeyTotal = "KeyTotal";
 
@@ -133,6 +133,7 @@ public void onFailure(Call call, IOException e) {
                 broadcastIntent.setAction(RNFetchBlobServiceBroadcast);
                 broadcastIntent.addCategory(CategoryFail);
                 broadcastIntent.putExtra(BroadcastMsg, e.getMessage().getBytes());
+                broadcastIntent.putExtra(BroadcastTaskId, _taskId);
                 sendBroadcast(broadcastIntent);
                 call.cancel();
             }
@@ -144,6 +145,7 @@ public void onResponse(Call call, Response response) throws IOException {
                 broadcastIntent.setAction(RNFetchBlobServiceBroadcast);
                 broadcastIntent.addCategory(CategorySuccess);
                 broadcastIntent.putExtra(BroadcastMsg, response.body().bytes());
+                broadcastIntent.putExtra(BroadcastTaskId, _taskId);
                 sendBroadcast(broadcastIntent);
 
                 response.body().close();
@@ -175,13 +177,11 @@ public void onProgress(long bytesWritten, long contentLength, boolean done) {
         Intent broadcastIntent = new Intent();
         broadcastIntent.setAction(RNFetchBlobServiceBroadcast);
         broadcastIntent.addCategory(CategoryProgress);
+        broadcastIntent.putExtra(BroadcastTaskId, _taskId);
         HashMap map = new HashMap();
         map.put(KeyWritten, Long.valueOf(bytesWritten));
         map.put(KeyTotal, Long.valueOf(contentLength));
-        map.put(KeyTaskId, this._taskId);
         broadcastIntent.putExtra(BroadcastProgressMap, map);
         sendBroadcast(broadcastIntent);
     }
 }
-
-