Proper usage of shared instance

Artur Chrusciel · Artur Chrusciel · commit ad6576342831 · 2018-01-16T08:31:49.000+01:00
diff --git a/ios/RNFetchBlob/RNFetchBlob.m b/ios/RNFetchBlob/RNFetchBlob.m
@@ -96,12 +96,12 @@ - (NSDictionary *)constantsToExport
         // send HTTP request
         else
         {
-            [RNFetchBlobNetwork sendRequest:options
-                              contentLength:bodyLength
-                                     bridge:self.bridge
-                                     taskId:taskId
-                                withRequest:req
-                                   callback:callback];
+            [[RNFetchBlobNetwork sharedInstance] sendRequest:options
+                                               contentLength:bodyLength
+                                                      bridge:self.bridge
+                                                      taskId:taskId
+                                                 withRequest:req
+                                                    callback:callback];
         }
     }];
 
@@ -132,12 +132,12 @@ - (NSDictionary *)constantsToExport
         // send HTTP request
         else
         {
-            [RNFetchBlobNetwork sendRequest:options
-                              contentLength:bodyLength
-                                     bridge:self.bridge
-                                     taskId:taskId
-                                withRequest:req
-                                   callback:callback];
+            [[RNFetchBlobNetwork sharedInstance] sendRequest:options
+                                               contentLength:bodyLength
+                                                      bridge:self.bridge
+                                                      taskId:taskId
+                                                 withRequest:req
+                                                    callback:callback];
         }
     }];
 }
@@ -496,7 +496,7 @@ - (NSDictionary *)constantsToExport
 
 #pragma mark - net.cancelRequest
 RCT_EXPORT_METHOD(cancelRequest:(NSString *)taskId callback:(RCTResponseSenderBlock)callback) {
-    [RNFetchBlobNetwork cancelRequest:taskId];
+    [[RNFetchBlobNetwork sharedInstance] cancelRequest:taskId];
     callback(@[[NSNull null], taskId]);
 
 }
@@ -506,14 +506,14 @@ - (NSDictionary *)constantsToExport
 {
 
     RNFetchBlobProgress * cfg = [[RNFetchBlobProgress alloc] initWithType:Download interval:interval count:count];
-    [RNFetchBlobNetwork enableProgressReport:taskId config:cfg];
+    [[RNFetchBlobNetwork sharedInstance] enableProgressReport:taskId config:cfg];
 }
 
 #pragma mark - net.enableUploadProgressReport
 RCT_EXPORT_METHOD(enableUploadProgressReport:(NSString *)taskId interval:(nonnull NSNumber*)interval count:(nonnull NSNumber*)count)
 {
     RNFetchBlobProgress * cfg = [[RNFetchBlobProgress alloc] initWithType:Upload interval:interval count:count];
-    [RNFetchBlobNetwork enableUploadProgress:taskId config:cfg];
+    [[RNFetchBlobNetwork sharedInstance] enableUploadProgress:taskId config:cfg];
 }
 
 #pragma mark - fs.slice
diff --git a/ios/RNFetchBlobNetwork.h b/ios/RNFetchBlobNetwork.h
@@ -28,13 +28,19 @@
 
 + (RNFetchBlobNetwork* _Nullable)sharedInstance;
 + (NSMutableDictionary  * _Nullable ) normalizeHeaders:(NSDictionary * _Nullable)headers;
-+ (void) cancelRequest:(NSString * _Nonnull)taskId;
 + (void) emitExpiredTasks;
-+ (void) enableProgressReport:(NSString * _Nonnull) taskId config:(RNFetchBlobProgress * _Nullable)config;
-+ (void) enableUploadProgress:(NSString * _Nonnull) taskId config:(RNFetchBlobProgress * _Nullable)config;
 
 - (nullable id) init;
-+ (void) sendRequest:(NSDictionary  * _Nullable )options contentLength:(long)contentLength bridge:(RCTBridge * _Nullable)bridgeRef taskId:(NSString * _Nullable)taskId withRequest:(NSURLRequest * _Nullable)req callback:(_Nullable RCTResponseSenderBlock) callback;
+- (void) sendRequest:(NSDictionary  * _Nullable )options
+       contentLength:(long)contentLength
+              bridge:(RCTBridge * _Nullable)bridgeRef
+              taskId:(NSString * _Nullable)taskId
+         withRequest:(NSURLRequest * _Nullable)req
+            callback:(_Nullable RCTResponseSenderBlock) callback;
+- (void) cancelRequest:(NSString * _Nonnull)taskId;
+- (void) enableProgressReport:(NSString * _Nonnull) taskId config:(RNFetchBlobProgress * _Nullable)config;
+- (void) enableUploadProgress:(NSString * _Nonnull) taskId config:(RNFetchBlobProgress * _Nullable)config;
+
 
 @end
 
diff --git a/ios/RNFetchBlobNetwork.m b/ios/RNFetchBlobNetwork.m
@@ -69,7 +69,7 @@ + (RNFetchBlobNetwork* _Nullable)sharedInstance {
     return _sharedInstance;
 }
 
-+ (void) sendRequest:(__weak NSDictionary  * _Nullable )options
+- (void) sendRequest:(__weak NSDictionary  * _Nullable )options
        contentLength:(long) contentLength
               bridge:(RCTBridge * _Nullable)bridgeRef
               taskId:(NSString * _Nullable)taskId
@@ -82,40 +82,53 @@ + (void) sendRequest:(__weak NSDictionary  * _Nullable )options
                   bridge:bridgeRef
                   taskId:taskId
              withRequest:req
-      taskOperationQueue:[self sharedInstance].taskQueue
+      taskOperationQueue:self.taskQueue
                 callback:callback];
     
     @synchronized([RNFetchBlobNetwork class]) {
-        [[self sharedInstance].requestsTable setObject:request forKey:taskId];
+        [self.requestsTable setObject:request forKey:taskId];
     }
 }
 
-+ (void) enableProgressReport:(NSString *) taskId config:(RNFetchBlobProgress *)config
+- (void) enableProgressReport:(NSString *) taskId config:(RNFetchBlobProgress *)config
 {
     if (config) {
         @synchronized ([RNFetchBlobNetwork class]) {
-            [[self sharedInstance].requestsTable objectForKey:taskId].progressConfig = config;
+            [self.requestsTable objectForKey:taskId].progressConfig = config;
         }
     }
 }
 
-+ (void) enableUploadProgress:(NSString *) taskId config:(RNFetchBlobProgress *)config
+- (void) enableUploadProgress:(NSString *) taskId config:(RNFetchBlobProgress *)config
 {
     if (config) {
         @synchronized ([RNFetchBlobNetwork class]) {
-            [[self sharedInstance].requestsTable objectForKey:taskId].uploadProgressConfig = config;
+            [self.requestsTable objectForKey:taskId].uploadProgressConfig = config;
         }
     }
 }
 
+- (void) cancelRequest:(NSString *)taskId
+{
+    NSURLSessionDataTask * task;
+    
+    @synchronized ([RNFetchBlobNetwork class]) {
+        task = [self.requestsTable objectForKey:taskId].task;
+    }
+    
+    if(task && task.state == NSURLSessionTaskStateRunning) {
+        [task cancel];
+    }
+}
+
 // removing case from headers
 + (NSMutableDictionary *) normalizeHeaders:(NSDictionary *)headers
 {
     NSMutableDictionary * mheaders = [[NSMutableDictionary alloc]init];
     for(NSString * key in headers) {
         [mheaders setValue:[headers valueForKey:key] forKey:[key lowercaseString]];
     }
-
+    
     return mheaders;
 }
 
@@ -140,17 +153,4 @@ + (void) emitExpiredTasks
     }
 }
 
-+ (void) cancelRequest:(NSString *)taskId
-{
-    NSURLSessionDataTask * task;
-    
-    @synchronized ([RNFetchBlobNetwork class]) {
-        task = [[self sharedInstance].requestsTable objectForKey:taskId].task;
-    }
-    
-    if(task && task.state == NSURLSessionTaskStateRunning) {
-        [task cancel];
-    }
-}
-
 @end

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ + (RNFetchBlobNetwork* _Nullable)sharedInstance {`
`69`	`69`	`return _sharedInstance;`
`70`	`70`	`}`
`71`	`71`
`72`		`-+ (void) sendRequest:(__weak NSDictionary * _Nullable )options`
	`72`	`+- (void) sendRequest:(__weak NSDictionary * _Nullable )options`
`73`	`73`	`contentLength:(long) contentLength`
`74`	`74`	`bridge:(RCTBridge * _Nullable)bridgeRef`
`75`	`75`	`taskId:(NSString * _Nullable)taskId`
`@@ -82,40 +82,53 @@ + (void) sendRequest:(__weak NSDictionary * _Nullable )options`
`82`	`82`	`bridge:bridgeRef`
`83`	`83`	`taskId:taskId`
`84`	`84`	`withRequest:req`
`85`		`- taskOperationQueue:[self sharedInstance].taskQueue`
	`85`	`+ taskOperationQueue:self.taskQueue`
`86`	`86`	`callback:callback];`
`87`	`87`
`88`	`88`	`@synchronized([RNFetchBlobNetwork class]) {`
`89`		`- [[self sharedInstance].requestsTable setObject:request forKey:taskId];`
	`89`	`+ [self.requestsTable setObject:request forKey:taskId];`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`		`-+ (void) enableProgressReport:(NSString ) taskId config:(RNFetchBlobProgress )config`
	`93`	`+- (void) enableProgressReport:(NSString ) taskId config:(RNFetchBlobProgress )config`
`94`	`94`	`{`
`95`	`95`	`if (config) {`
`96`	`96`	`@synchronized ([RNFetchBlobNetwork class]) {`
`97`		`- [[self sharedInstance].requestsTable objectForKey:taskId].progressConfig = config;`
	`97`	`+ [self.requestsTable objectForKey:taskId].progressConfig = config;`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`
`102`		`-+ (void) enableUploadProgress:(NSString ) taskId config:(RNFetchBlobProgress )config`
	`102`	`+- (void) enableUploadProgress:(NSString ) taskId config:(RNFetchBlobProgress )config`
`103`	`103`	`{`
`104`	`104`	`if (config) {`
`105`	`105`	`@synchronized ([RNFetchBlobNetwork class]) {`
`106`		`- [[self sharedInstance].requestsTable objectForKey:taskId].uploadProgressConfig = config;`
	`106`	`+ [self.requestsTable objectForKey:taskId].uploadProgressConfig = config;`
`107`	`107`	`}`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
	`111`	`+- (void) cancelRequest:(NSString *)taskId`
	`112`	`+{`
	`113`	`+ NSURLSessionDataTask * task;`
	`114`	`+`
	`115`	`+ @synchronized ([RNFetchBlobNetwork class]) {`
	`116`	`+ task = [self.requestsTable objectForKey:taskId].task;`
	`117`	`+ }`
	`118`	`+`
	`119`	`+ if(task && task.state == NSURLSessionTaskStateRunning) {`
	`120`	`+ [task cancel];`
	`121`	`+ }`
	`122`	`+}`
	`123`	`+`
`111`	`124`	`// removing case from headers`
`112`	`125`	`+ (NSMutableDictionary ) normalizeHeaders:(NSDictionary )headers`
`113`	`126`	`{`
`114`	`127`	`NSMutableDictionary * mheaders = [[NSMutableDictionary alloc]init];`
`115`	`128`	`for(NSString * key in headers) {`
`116`	`129`	`[mheaders setValue:[headers valueForKey:key] forKey:[key lowercaseString]];`
`117`	`130`	`}`
`118`		`-`
	`131`	`+`
`119`	`132`	`return mheaders;`
`120`	`133`	`}`
`121`	`134`
`@@ -140,17 +153,4 @@ + (void) emitExpiredTasks`
`140`	`153`	`}`
`141`	`154`	`}`
`142`	`155`
`143`		`-+ (void) cancelRequest:(NSString *)taskId`
`144`		`-{`
`145`		`- NSURLSessionDataTask * task;`
`146`		`-`
`147`		`- @synchronized ([RNFetchBlobNetwork class]) {`
`148`		`- task = [[self sharedInstance].requestsTable objectForKey:taskId].task;`
`149`		`- }`
`150`		`-`
`151`		`- if(task && task.state == NSURLSessionTaskStateRunning) {`
`152`		`- [task cancel];`
`153`		`- }`
`154`		`-}`
`155`		`-`
`156`	`156`	`@end`