Skip to content

fix: add jobId condition inside upload event #1226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: add jobId condition inside upload event #1226

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions FS.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,17 +572,25 @@ var RNFS = {
if (options.method && typeof options.method !== 'string') throw new Error('uploadFiles: Invalid value for property `method`');

if (options.begin) {
subscriptions.push(RNFS_NativeEventEmitter.addListener('UploadBegin', options.begin));
subscriptions.push(RNFS_NativeEventEmitter.addListener('UploadBegin', (res) => {
if (res.jobId === jobId) options.begin(res);
}));
} else if (options.beginCallback) {
// Deprecated
subscriptions.push(RNFS_NativeEventEmitter.addListener('UploadBegin', options.beginCallback));
subscriptions.push(RNFS_NativeEventEmitter.addListener('UploadBegin', (res) => {
if (res.jobId === jobId) options.beginCallback(res);
}));
}

if (options.progress) {
subscriptions.push(RNFS_NativeEventEmitter.addListener('UploadProgress', options.progress));
subscriptions.push(RNFS_NativeEventEmitter.addListener('UploadProgress', (res) => {
if (res.jobId === jobId) options.progress(res);
}));
} else if (options.progressCallback) {
// Deprecated
subscriptions.push(RNFS_NativeEventEmitter.addListener('UploadProgress', options.progressCallback));
subscriptions.push(RNFS_NativeEventEmitter.addListener('UploadProgress', (res) => {
if (res.jobId === jobId) options.progressCallback(res);
}));
}

var bridgeOptions = {
Expand Down