Skip to content
This repository was archived by the owner on Mar 16, 2019. It is now read-only.

Commit 13bb6f0

Browse files
committed
Change DeviceEvent usage.
1 parent d2a1b79 commit 13bb6f0

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void onProgress(long bytesWritten, long totalSize) {
4141

4242
// emit event to js context
4343
this.mCtx.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
44-
.emit("RNFetchBlobProgress" + this.mTaskId, args);
44+
.emit("RNFetchBlobProgress", args);
4545
}
4646

4747
@Override

src/index.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,16 @@ const fetch = (...args) => {
2727

2828
let [method, url, headers, body] = [...args]
2929
let nativeMethodName = Array.isArray(body) ? 'fetchBlobForm' : 'fetchBlob'
30-
31-
let progressEventHandler = (e) => {
30+
let handle = DeviceEventEmitter.addListener('RNFetchBlobProgress', (e) => {
3231
if(e.taskId === taskId && promise.onProgress) {
3332
promise.onProgress(e.written, e.total)
3433
}
35-
}
36-
37-
DeviceEventEmitter.addListener('RNFetchBlobProgress' + taskId, progressEventHandler)
34+
})
3835

3936
RNFetchBlob[nativeMethodName](taskId, method, url, headers || {}, body, (err, ...data) => {
4037

4138
// task done, remove event listener
42-
DeviceEventEmitter.removeAllListeners('RNFetchBlobProgress'+taskId)
39+
handle.remove()
4340

4441
if(err)
4542
reject(new Error(err, ...data))

0 commit comments

Comments
 (0)