Proper usage of shared instance

ios/RNFetchBlob/RNFetchBlob.m

@@ -96,12 +96,12 @@ RCT_EXPORT_METHOD(fetchBlobForm:(NSDictionary *)options
         // 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 @@ RCT_EXPORT_METHOD(fetchBlob:(NSDictionary *)options
         // 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 @@ RCT_EXPORT_METHOD(getEnvironmentDirs:(RCTResponseSenderBlock) callback)
 
 #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 @@ RCT_EXPORT_METHOD(enableProgressReport:(NSString *)taskId interval:(nonnull NSNu
 {
 
     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

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
 

ios/RNFetchBlobNetwork.m

@@ -69,7 +69,7 @@ static void initialize_tables() {
     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,32 +82,45 @@ static void initialize_tables() {
                   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
 {
@@ -115,7 +128,7 @@ static void initialize_tables() {
     for(NSString * key in headers) {
         [mheaders setValue:[headers valueForKey:key] forKey:[key lowercaseString]];
     }
-
+    
     return mheaders;
 }
 
@@ -140,17 +153,4 @@ static void initialize_tables() {
     }
 }
 
-+ (void) cancelRequest:(NSString *)taskId
-{
-    NSURLSessionDataTask * task;
-    
-    @synchronized ([RNFetchBlobNetwork class]) {
-        task = [[self sharedInstance].requestsTable objectForKey:taskId].task;
-    }
-    
-    if(task && task.state == NSURLSessionTaskStateRunning) {
-        [task cancel];
-    }
-}
-
 @end