Merge pull request joltup#155 from yurnery/master

fix progress and uploadProgress not callback in iOS

Author: Traviskn

ios/RNFetchBlobNetwork.h

@@ -25,6 +25,8 @@
 
 @property(nonnull, nonatomic) NSOperationQueue *taskQueue;
 @property(nonnull, nonatomic) NSMapTable<NSString*, RNFetchBlobRequest*> * requestsTable;
+@property(nonnull, nonatomic) NSMutableDictionary<NSString*, RNFetchBlobProgress*> *rebindProgressDict;
+@property(nonnull, nonatomic) NSMutableDictionary<NSString*, RNFetchBlobProgress*> *rebindUploadProgressDict;
 
 + (RNFetchBlobNetwork* _Nullable)sharedInstance;
 + (NSMutableDictionary  * _Nullable ) normalizeHeaders:(NSDictionary * _Nullable)headers;

ios/RNFetchBlobNetwork.m

@@ -53,6 +53,8 @@ - (id)init {
         self.taskQueue = [[NSOperationQueue alloc] init];
         self.taskQueue.qualityOfService = NSQualityOfServiceUtility;
         self.taskQueue.maxConcurrentOperationCount = 10;
+        self.rebindProgressDict = [NSMutableDictionary dictionary];
+        self.rebindUploadProgressDict = [NSMutableDictionary dictionary];
     }
 
     return self;
@@ -87,14 +89,33 @@ - (void) sendRequest:(__weak NSDictionary  * _Nullable )options
 
     @synchronized([RNFetchBlobNetwork class]) {
         [self.requestsTable setObject:request forKey:taskId];
+        [self checkProgressConfig];
     }
 }
 
+- (void) checkProgressConfig {
+    //reconfig progress
+    [self.rebindProgressDict enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, RNFetchBlobProgress * _Nonnull config, BOOL * _Nonnull stop) {
+        [self enableProgressReport:key config:config];
+    }];
+    [self.rebindProgressDict removeAllObjects];
+    
+    //reconfig uploadProgress
+    [self.rebindUploadProgressDict enumerateKeysAndObjectsUsingBlock:^(NSString * _Nonnull key, RNFetchBlobProgress * _Nonnull config, BOOL * _Nonnull stop) {
+        [self enableUploadProgress:key config:config];
+    }];
+    [self.rebindUploadProgressDict removeAllObjects];
+}
+
 - (void) enableProgressReport:(NSString *) taskId config:(RNFetchBlobProgress *)config
 {
     if (config) {
         @synchronized ([RNFetchBlobNetwork class]) {
-            [self.requestsTable objectForKey:taskId].progressConfig = config;
+            if (![self.requestsTable objectForKey:taskId]) {
+                [self.rebindProgressDict setValue:config forKey:taskId];
+            } else {
+                [self.requestsTable objectForKey:taskId].progressConfig = config;
+            }
         }
     }
 }
@@ -103,7 +124,11 @@ - (void) enableUploadProgress:(NSString *) taskId config:(RNFetchBlobProgress *)
 {
     if (config) {
         @synchronized ([RNFetchBlobNetwork class]) {
-            [self.requestsTable objectForKey:taskId].uploadProgressConfig = config;
+            if (![self.requestsTable objectForKey:taskId]) {
+                [self.rebindUploadProgressDict setValue:config forKey:taskId];
+            } else {
+                [self.requestsTable objectForKey:taskId].uploadProgressConfig = config;
+            }
         }
     }
 }