Skip to content

Commit 0a5e1fe

Browse files
authored
Merge pull request RonRadtke#10 from eschos24/fix_multiple_configs
Handle configs for each task individually rather than enumerating thr…
2 parents 6b6fdac + 393d2ba commit 0a5e1fe

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

ios/RNFetchBlobNetwork.m

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -89,22 +89,24 @@ - (void) sendRequest:(__weak NSDictionary * _Nullable )options
8989

9090
@synchronized([RNFetchBlobNetwork class]) {
9191
[self.requestsTable setObject:request forKey:taskId];
92-
[self checkProgressConfig];
92+
[self checkProgressConfigForTask:taskId];
9393
}
9494
}
9595

96-
- (void) checkProgressConfig {
96+
- (void) checkProgressConfigForTask:(NSString *)taskId {
9797
//reconfig progress
98-
[self.rebindProgressDict enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, RNFetchBlobProgress * _Nonnull config, BOOL * _Nonnull stop) {
99-
[self enableProgressReport:key config:config];
100-
}];
101-
[self.rebindProgressDict removeAllObjects];
98+
RNFetchBlobProgress *downloadConfig = self.rebindProgressDict[taskId];
99+
if (downloadConfig != nil) {
100+
[self enableProgressReport:taskId config:downloadConfig];
101+
[self.rebindProgressDict removeObjectForKey:taskId];
102+
}
102103

103104
//reconfig uploadProgress
104-
[self.rebindUploadProgressDict enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, RNFetchBlobProgress * _Nonnull config, BOOL * _Nonnull stop) {
105-
[self enableUploadProgress:key config:config];
106-
}];
107-
[self.rebindUploadProgressDict removeAllObjects];
105+
RNFetchBlobProgress *uploadConfig = self.rebindUploadProgressDict[taskId];
106+
if (uploadConfig != nil) {
107+
[self enableUploadProgress:taskId config:uploadConfig];
108+
[self.rebindUploadProgressDict removeObjectForKey:taskId];
109+
}
108110
}
109111

110112
- (void) enableProgressReport:(NSString *) taskId config:(RNFetchBlobProgress *)config

0 commit comments

Comments
 (0)