Mostly RNFetchBlobNetwork cleanup

ios/RNFetchBlob/RNFetchBlob.h

@@ -39,7 +39,6 @@
 @property (retain) UIDocumentInteractionController * documentController;
 
 + (RCTBridge *)getRCTBridge;
-+ (void) checkExpiredSessions;
 
 @end
 

ios/RNFetchBlob/RNFetchBlob.m

@@ -38,7 +38,7 @@ dispatch_queue_t fsQueue;
 
 + (RCTBridge *)getRCTBridge
 {
-    RCTRootView * rootView = [[UIApplication sharedApplication] keyWindow].rootViewController.view;
+    RCTRootView * rootView = (RCTRootView*) [[UIApplication sharedApplication] keyWindow].rootViewController.view;
     return rootView.bridge;
 }
 
@@ -128,7 +128,7 @@ RCT_EXPORT_METHOD(fetchBlob:(NSDictionary *)options
         // send HTTP request
         else
         {
-            __block RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
+            RNFetchBlobNetwork * utils = [[RNFetchBlobNetwork alloc] init];
             [utils sendRequest:options contentLength:bodyLength bridge:self.bridge taskId:taskId withRequest:req callback:callback];
         }
     }];

ios/RNFetchBlobConst.m

@@ -7,38 +7,38 @@
 //
 #import "RNFetchBlobConst.h"
 
-extern NSString *const FILE_PREFIX = @"RNFetchBlob-file://";
-extern NSString *const ASSET_PREFIX = @"bundle-assets://";
-extern NSString *const AL_PREFIX = @"assets-library://";
+NSString *const FILE_PREFIX = @"RNFetchBlob-file://";
+NSString *const ASSET_PREFIX = @"bundle-assets://";
+NSString *const AL_PREFIX = @"assets-library://";
 
 // fetch configs
-extern NSString *const CONFIG_USE_TEMP = @"fileCache";
-extern NSString *const CONFIG_FILE_PATH = @"path";
-extern NSString *const CONFIG_FILE_EXT = @"appendExt";
-extern NSString *const CONFIG_TRUSTY = @"trusty";
-extern NSString *const CONFIG_INDICATOR = @"indicator";
-extern NSString *const CONFIG_KEY = @"key";
-extern NSString *const CONFIG_EXTRA_BLOB_CTYPE = @"binaryContentTypes";
+NSString *const CONFIG_USE_TEMP = @"fileCache";
+NSString *const CONFIG_FILE_PATH = @"path";
+NSString *const CONFIG_FILE_EXT = @"appendExt";
+NSString *const CONFIG_TRUSTY = @"trusty";
+NSString *const CONFIG_INDICATOR = @"indicator";
+NSString *const CONFIG_KEY = @"key";
+NSString *const CONFIG_EXTRA_BLOB_CTYPE = @"binaryContentTypes";
 
-extern NSString *const EVENT_STATE_CHANGE = @"RNFetchBlobState";
-extern NSString *const EVENT_SERVER_PUSH = @"RNFetchBlobServerPush";
-extern NSString *const EVENT_PROGRESS = @"RNFetchBlobProgress";
-extern NSString *const EVENT_PROGRESS_UPLOAD = @"RNFetchBlobProgress-upload";
-extern NSString *const EVENT_EXPIRE = @"RNFetchBlobExpire";
+NSString *const EVENT_STATE_CHANGE = @"RNFetchBlobState";
+NSString *const EVENT_SERVER_PUSH = @"RNFetchBlobServerPush";
+NSString *const EVENT_PROGRESS = @"RNFetchBlobProgress";
+NSString *const EVENT_PROGRESS_UPLOAD = @"RNFetchBlobProgress-upload";
+NSString *const EVENT_EXPIRE = @"RNFetchBlobExpire";
 
-extern NSString *const MSG_EVENT = @"RNFetchBlobMessage";
-extern NSString *const MSG_EVENT_LOG = @"log";
-extern NSString *const MSG_EVENT_WARN = @"warn";
-extern NSString *const MSG_EVENT_ERROR = @"error";
-extern NSString *const FS_EVENT_DATA = @"data";
-extern NSString *const FS_EVENT_END = @"end";
-extern NSString *const FS_EVENT_WARN = @"warn";
-extern NSString *const FS_EVENT_ERROR = @"error";
+NSString *const MSG_EVENT = @"RNFetchBlobMessage";
+NSString *const MSG_EVENT_LOG = @"log";
+NSString *const MSG_EVENT_WARN = @"warn";
+NSString *const MSG_EVENT_ERROR = @"error";
+NSString *const FS_EVENT_DATA = @"data";
+NSString *const FS_EVENT_END = @"end";
+NSString *const FS_EVENT_WARN = @"warn";
+NSString *const FS_EVENT_ERROR = @"error";
 
-extern NSString *const KEY_REPORT_PROGRESS = @"reportProgress";
-extern NSString *const KEY_REPORT_UPLOAD_PROGRESS = @"reportUploadProgress";
+NSString *const KEY_REPORT_PROGRESS = @"reportProgress";
+NSString *const KEY_REPORT_UPLOAD_PROGRESS = @"reportUploadProgress";
 
 // response type
-extern NSString *const RESP_TYPE_BASE64 = @"base64";
-extern NSString *const RESP_TYPE_UTF8 = @"utf8";
-extern NSString *const RESP_TYPE_PATH = @"path";
+NSString *const RESP_TYPE_BASE64 = @"base64";
+NSString *const RESP_TYPE_UTF8 = @"utf8";
+NSString *const RESP_TYPE_PATH = @"path";

ios/RNFetchBlobFS.h

@@ -34,8 +34,8 @@
     NSString * streamId;
 }
 
-@property (nonatomic) NSOutputStream * outStream;
-@property (nonatomic) NSInputStream * inStream;
+@property (nonatomic) NSOutputStream * _Nullable outStream;
+@property (nonatomic) NSInputStream * _Nullable inStream;
 @property (strong, nonatomic) RCTResponseSenderBlock callback;
 @property (nonatomic) RCTBridge * bridge;
 @property (nonatomic) NSString * encoding;

ios/RNFetchBlobNetwork.h

@@ -20,39 +20,31 @@
 #define RNFetchBlobNetwork_h
 
 
-
 typedef void(^CompletionHander)(NSURL * _Nullable location, NSURLResponse * _Nullable response, NSError * _Nullable error);
 typedef void(^DataTaskCompletionHander) (NSData * _Nullable resp, NSURLResponse * _Nullable response, NSError * _Nullable error);
 
 @interface RNFetchBlobNetwork : NSObject  <NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDataDelegate>
 
 @property (nullable, nonatomic) NSString * taskId;
-@property (nonatomic) int expectedBytes;
-@property (nonatomic) int receivedBytes;
+@property (nonatomic) long long expectedBytes;
+@property (nonatomic) long long receivedBytes;
 @property (nonatomic) BOOL isServerPush;
 @property (nullable, nonatomic) NSMutableData * respData;
-@property (strong, nonatomic) RCTResponseSenderBlock callback;
+@property (nullable, strong, nonatomic) RCTResponseSenderBlock callback;
 @property (nullable, nonatomic) RCTBridge * bridge;
 @property (nullable, nonatomic) NSDictionary * options;
 @property (nullable, nonatomic) RNFetchBlobFS * fileStream;
-@property (strong, nonatomic) CompletionHander fileTaskCompletionHandler;
-@property (strong, nonatomic) DataTaskCompletionHander dataTaskCompletionHandler;
 @property (nullable, nonatomic) NSError * error;
 
 
 + (NSMutableDictionary  * _Nullable ) normalizeHeaders:(NSDictionary * _Nullable)headers;
-+ (void) cancelRequest:(NSString *)taskId;
-+ (void) enableProgressReport:(NSString *) taskId;
-+ (void) enableUploadProgress:(NSString *) taskId;
++ (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;
 - (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) enableProgressReport:(NSString *) taskId config:(RNFetchBlobProgress *)config;
-+ (void) enableUploadProgress:(NSString *) taskId config:(RNFetchBlobProgress *)config;
-
-
 
 @end
 

ios/RNFetchBlobNetwork.m

@@ -70,18 +70,17 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
 
 @interface RNFetchBlobNetwork ()
 {
-    BOOL * respFile;
+    BOOL respFile;
     BOOL isNewPart;
-    BOOL * isIncrement;
+    BOOL isIncrement;
     NSMutableData * partBuffer;
     NSString * destPath;
     NSOutputStream * writeStream;
     long bodyLength;
-    NSMutableDictionary * respInfo;
     NSInteger respStatus;
     NSMutableArray * redirects;
     ResponseFormat responseFormat;
-    BOOL * followRedirect;
+    BOOL followRedirect;
     BOOL backgroundTask;
 }
 
@@ -97,8 +96,6 @@ NSOperationQueue *taskQueue;
 @synthesize callback;
 @synthesize bridge;
 @synthesize options;
-@synthesize fileTaskCompletionHandler;
-@synthesize dataTaskCompletionHandler;
 @synthesize error;
 
 
@@ -121,7 +118,7 @@ NSOperationQueue *taskQueue;
         {
             progressTable = [[NSMutableDictionary alloc] init];
         }
-        [progressTable setValue:config forKey:taskId];
+        if (config) [progressTable setValue:config forKey:taskId];
     }
 }
 
@@ -132,7 +129,7 @@ NSOperationQueue *taskQueue;
         {
             uploadProgressTable = [[NSMutableDictionary alloc] init];
         }
-        [uploadProgressTable setValue:config forKey:taskId];
+        if (config) [uploadProgressTable setValue:config forKey:taskId];
     }
 }
 
@@ -193,9 +190,8 @@ NSOperationQueue *taskQueue;
         responseFormat = AUTO;
 
     NSString * path = [self.options valueForKey:CONFIG_FILE_PATH];
-    NSString * ext = [self.options valueForKey:CONFIG_FILE_EXT];
 	NSString * key = [self.options valueForKey:CONFIG_KEY];
-    __block NSURLSession * session;
+    NSURLSession * session;
 
     bodyLength = contentLength;
 
@@ -246,16 +242,15 @@ NSOperationQueue *taskQueue;
         respFile = NO;
     }
 
-    __block NSURLSessionDataTask * task = [session dataTaskWithRequest:req];
+    NSURLSessionDataTask * task = [session dataTaskWithRequest:req];
     @synchronized ([RNFetchBlobNetwork class]){
         [taskTable setObject:task forKey:taskId];
-        [task resume];
     }
+    [task resume];
 
     // network status indicator
     if([[options objectForKey:CONFIG_INDICATOR] boolValue] == YES)
         [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
-    __block UIApplication * app = [UIApplication sharedApplication];
 
 }
 
@@ -269,7 +264,7 @@ NSOperationQueue *taskQueue;
         while((key = [emu nextObject]))
         {
             RCTBridge * bridge = [RNFetchBlob getRCTBridge];
-            NSData * args = @{ @"taskId": key };
+            id args = @{ @"taskId": key };
             [bridge.eventDispatcher sendDeviceEventWithName:EVENT_EXPIRE body:args];
 
         }
@@ -352,23 +347,14 @@ NSOperationQueue *taskQueue;
             {
                 respType = @"blob";
                 // for XMLHttpRequest, switch response data handling strategy automatically
-                if([options valueForKey:@"auto"] == YES) {
+                if([options valueForKey:@"auto"]) {
                     respFile = YES;
                     destPath = [RNFetchBlobFS getTempPath:taskId withExtension:@""];
                 }
             }
-        }
-        else
+        } else {
             respType = @"text";
-        respInfo = @{
-                     @"taskId": taskId,
-                     @"state": @"2",
-                     @"headers": headers,
-                     @"redirects": redirects,
-                     @"respType" : respType,
-                     @"timeout" : @NO,
-                     @"status": [NSNumber numberWithInteger:statusCode]
-                    };
+        }
 
 #pragma mark - handling cookies
         // # 153 get cookies
@@ -383,11 +369,16 @@ NSOperationQueue *taskQueue;
 
         [self.bridge.eventDispatcher
          sendDeviceEventWithName: EVENT_STATE_CHANGE
-         body:respInfo
+         body:@{
+                @"taskId": taskId,
+                @"state": @"2",
+                @"headers": headers,
+                @"redirects": redirects,
+                @"respType" : respType,
+                @"timeout" : @NO,
+                @"status": [NSNumber numberWithInteger:statusCode]
+                }
         ];
-        headers = nil;
-        respInfo = nil;
-
     }
     else
         NSLog(@"oops");
@@ -475,8 +466,8 @@ NSOperationQueue *taskQueue;
          sendDeviceEventWithName:EVENT_PROGRESS
          body:@{
                 @"taskId": taskId,
-                @"written": [NSString stringWithFormat:@"%d", receivedBytes],
-                @"total": [NSString stringWithFormat:@"%d", expectedBytes],
+                @"written": [NSString stringWithFormat:@"%ld", (long) receivedBytes],
+                @"total": [NSString stringWithFormat:@"%ld", (long) expectedBytes],
                 @"chunk": chunkString
                 }
          ];
@@ -494,17 +485,12 @@ NSOperationQueue *taskQueue;
 {
 
     self.error = error;
-    NSString * errMsg = [NSNull null];
-    NSString * respStr = [NSNull null];
-    NSString * rnfbRespType = @"";
+    NSString * errMsg;
+    NSString * respStr;
+    NSString * rnfbRespType;
 
     [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
 
-    if(respInfo == nil)
-    {
-        respInfo = [NSNull null];
-    }
-
     if(error != nil)
     {
         errMsg = [error localizedDescription];
@@ -550,7 +536,11 @@ NSOperationQueue *taskQueue;
     }
 
 
-    callback(@[ errMsg, rnfbRespType, respStr]);
+    callback(@[
+               errMsg ?: [NSNull null],
+               rnfbRespType ?: @"",
+               respStr ?: [NSNull null]
+               ]);
 
     @synchronized ([RNFetchBlobNetwork class])
     {
@@ -608,7 +598,7 @@ NSOperationQueue *taskQueue;
 
 - (void) URLSession:(NSURLSession *)session didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition, NSURLCredential * _Nullable credantial))completionHandler
 {
-    BOOL trusty = [options valueForKey:CONFIG_TRUSTY];
+    BOOL trusty = [[options valueForKey:CONFIG_TRUSTY] boolValue];
     if(!trusty)
     {
         completionHandler(NSURLSessionAuthChallengePerformDefaultHandling, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);

ios/RNFetchBlobReqBuilder.h

@@ -29,7 +29,7 @@
                      body:(NSString *)body
                onComplete:(void(^)(NSURLRequest * req, long bodyLength))onComplete;
 
-+(NSString *) getHeaderIgnoreCases:(NSString *)field fromHeaders:(NSMutableArray *) headers;
++(NSString *) getHeaderIgnoreCases:(NSString *)field fromHeaders:(NSDictionary *) headers;
 
 
 @end

ios/RNFetchBlobReqBuilder.m

@@ -277,7 +277,7 @@
     }
 }
 
-+(NSString *) getHeaderIgnoreCases:(NSString *)field fromHeaders:(NSMutableDictionary *) headers {
++(NSString *) getHeaderIgnoreCases:(NSString *)field fromHeaders:(NSDictionary *) headers {
 
     NSString * normalCase = [headers valueForKey:field];
     NSString * ignoredCase = [headers valueForKey:[field lowercaseString]];