react-native-blob-util 0.22.0 → 0.22.2

package/ios/ReactNativeBlobUtilFileTransformer.h

@@ -1,24 +1,24 @@
-//  ReactNativeBlobUtilFileTransformer.h
-//  ReactNativeBlobUtil
-//
-
-#ifndef ReactNativeBlobUtilDataConverter_h
-#define ReactNativeBlobUtilDataConverter_h
-
-#import <UIKit/UIKit.h>
-
-
-@protocol FileTransformer <NSObject>
-- (NSData*) onWriteFile:(NSData*)data;
-- (NSData*) onReadFile:(NSData*)data;
-@end
-
-@interface ReactNativeBlobUtilFileTransformer : NSObject
-
-+ (void) setFileTransformer:(NSObject<FileTransformer>*) fileTransformer;
-+ (NSObject<FileTransformer>*) getFileTransformer;
-
-@end
-
-
+//  ReactNativeBlobUtilFileTransformer.h
+//  ReactNativeBlobUtil
+//
+
+#ifndef ReactNativeBlobUtilDataConverter_h
+#define ReactNativeBlobUtilDataConverter_h
+
+#import <UIKit/UIKit.h>
+
+
+@protocol FileTransformer <NSObject>
+- (NSData*) onWriteFile:(NSData*)data;
+- (NSData*) onReadFile:(NSData*)data;
+@end
+
+@interface ReactNativeBlobUtilFileTransformer : NSObject
+
++ (void) setFileTransformer:(NSObject<FileTransformer>*) fileTransformer;
++ (NSObject<FileTransformer>*) getFileTransformer;
+
+@end
+
+
 #endif /* ReactNativeBlobUtilFileTransformer_h */

package/ios/ReactNativeBlobUtilFileTransformer.mm

@@ -1,21 +1,21 @@
-//  ReactNativeBlobUtilFileTransformer.m
-//  ReactNativeBlobUtil
-//
-
-#import "ReactNativeBlobUtilFileTransformer.h"
-
-static NSObject<FileTransformer> *sharedFileTransformer;
-
-@implementation ReactNativeBlobUtilFileTransformer
-
-+ (void) setFileTransformer:(NSObject<FileTransformer> *)fileTransformer {
-     sharedFileTransformer = fileTransformer;
-}
-
-+ (NSObject<FileTransformer>*) getFileTransformer {
-    return sharedFileTransformer;
-}
-
-@end
-
+//  ReactNativeBlobUtilFileTransformer.m
+//  ReactNativeBlobUtil
+//
+
+#import "ReactNativeBlobUtilFileTransformer.h"
+
+static NSObject<FileTransformer> *sharedFileTransformer;
+
+@implementation ReactNativeBlobUtilFileTransformer
+
++ (void) setFileTransformer:(NSObject<FileTransformer> *)fileTransformer {
+     sharedFileTransformer = fileTransformer;
+}
+
++ (NSObject<FileTransformer>*) getFileTransformer {
+    return sharedFileTransformer;
+}
+
+@end
+
 // PHOENIX:PATCH-PACKAGE END

package/ios/ReactNativeBlobUtilNetwork.h

@@ -1,49 +1,49 @@
-//
-//  ReactNativeBlobUtilNetwork.h
-//  ReactNativeBlobUtil
-//
-//  Created by wkh237 on 2016/6/6.
-//  Copyright © 2016 wkh237. All rights reserved.
-//
-
-#ifndef ReactNativeBlobUtilNetwork_h
-#define ReactNativeBlobUtilNetwork_h
-
-#import <Foundation/Foundation.h>
-#import "ReactNativeBlobUtilProgress.h"
-#import "ReactNativeBlobUtilFS.h"
-#import "ReactNativeBlobUtilRequest.h"
-
-#if __has_include(<React/RCTAssert.h>)
-#import <React/RCTBridgeModule.h>
-#else
-#import "RCTBridgeModule.h"
-#endif
-
-
-@interface ReactNativeBlobUtilNetwork : NSObject  <NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDataDelegate>
-
-@property(nonnull, nonatomic) NSOperationQueue *taskQueue;
-@property(nonnull, nonatomic) NSMapTable<NSString*, ReactNativeBlobUtilRequest*> * requestsTable;
-@property(nonnull, nonatomic) NSMutableDictionary<NSString*, ReactNativeBlobUtilProgress*> *rebindProgressDict;
-@property(nonnull, nonatomic) NSMutableDictionary<NSString*, ReactNativeBlobUtilProgress*> *rebindUploadProgressDict;
-
-+ (ReactNativeBlobUtilNetwork* _Nullable)sharedInstance;
-+ (NSMutableDictionary  * _Nullable ) normalizeHeaders:(NSDictionary * _Nullable)headers;
-
-- (nullable id) init;
-- (void) sendRequest:(NSDictionary  * _Nullable )options
-       contentLength:(long)contentLength
-              baseModule:(ReactNativeBlobUtil * _Nullable)baseModule
-              taskId:(NSString * _Nullable)taskId
-         withRequest:(NSURLRequest * _Nullable)req
-            callback:(_Nullable RCTResponseSenderBlock) callback;
-- (void) cancelRequest:(NSString * _Nonnull)taskId;
-- (void) enableProgressReport:(NSString * _Nonnull) taskId config:(ReactNativeBlobUtilProgress * _Nullable)config;
-- (void) enableUploadProgress:(NSString * _Nonnull) taskId config:(ReactNativeBlobUtilProgress * _Nullable)config;
-
-
-@end
-
-
-#endif /* ReactNativeBlobUtilNetwork_h */
+//
+//  ReactNativeBlobUtilNetwork.h
+//  ReactNativeBlobUtil
+//
+//  Created by wkh237 on 2016/6/6.
+//  Copyright © 2016 wkh237. All rights reserved.
+//
+
+#ifndef ReactNativeBlobUtilNetwork_h
+#define ReactNativeBlobUtilNetwork_h
+
+#import <Foundation/Foundation.h>
+#import "ReactNativeBlobUtilProgress.h"
+#import "ReactNativeBlobUtilFS.h"
+#import "ReactNativeBlobUtilRequest.h"
+
+#if __has_include(<React/RCTAssert.h>)
+#import <React/RCTBridgeModule.h>
+#else
+#import "RCTBridgeModule.h"
+#endif
+
+
+@interface ReactNativeBlobUtilNetwork : NSObject  <NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDataDelegate>
+
+@property(nonnull, nonatomic) NSOperationQueue *taskQueue;
+@property(nonnull, nonatomic) NSMapTable<NSString*, ReactNativeBlobUtilRequest*> * requestsTable;
+@property(nonnull, nonatomic) NSMutableDictionary<NSString*, ReactNativeBlobUtilProgress*> *rebindProgressDict;
+@property(nonnull, nonatomic) NSMutableDictionary<NSString*, ReactNativeBlobUtilProgress*> *rebindUploadProgressDict;
+
++ (ReactNativeBlobUtilNetwork* _Nullable)sharedInstance;
++ (NSMutableDictionary  * _Nullable ) normalizeHeaders:(NSDictionary * _Nullable)headers;
+
+- (nullable id) init;
+- (void) sendRequest:(NSDictionary  * _Nullable )options
+       contentLength:(long)contentLength
+              baseModule:(ReactNativeBlobUtil * _Nullable)baseModule
+              taskId:(NSString * _Nullable)taskId
+         withRequest:(NSURLRequest * _Nullable)req
+            callback:(_Nullable RCTResponseSenderBlock) callback;
+- (void) cancelRequest:(NSString * _Nonnull)taskId;
+- (void) enableProgressReport:(NSString * _Nonnull) taskId config:(ReactNativeBlobUtilProgress * _Nullable)config;
+- (void) enableUploadProgress:(NSString * _Nonnull) taskId config:(ReactNativeBlobUtilProgress * _Nullable)config;
+
+
+@end
+
+
+#endif /* ReactNativeBlobUtilNetwork_h */

package/ios/ReactNativeBlobUtilNetwork.mm

@@ -1,159 +1,159 @@
-//
-//  ReactNativeBlobUtilNetwork.m
-//  ReactNativeBlobUtil
-//
-//  Created by wkh237 on 2016/6/6.
-//  Copyright © 2016 wkh237. All rights reserved.
-//
-
-
-#import <Foundation/Foundation.h>
-#import "ReactNativeBlobUtilNetwork.h"
-
-#import "ReactNativeBlobUtilConst.h"
-#import "ReactNativeBlobUtilProgress.h"
-
-#if __has_include(<React/RCTAssert.h>)
-#import <React/RCTRootView.h>
-#import <React/RCTLog.h>
-#import <React/RCTBridge.h>
-#else
-#import "RCTRootView.h"
-#import "RCTLog.h"
-#import "RCTBridge.h"
-#endif
-
-////////////////////////////////////////
-//
-//  HTTP request handler
-//
-////////////////////////////////////////
-
-NSMapTable * expirationTable;
-
-__attribute__((constructor))
-static void initialize_tables() {
-    if (expirationTable == nil) {
-        expirationTable = [[NSMapTable alloc] init];
-    }
-}
-
-
-@implementation ReactNativeBlobUtilNetwork
-
-
-- (id)init {
-    self = [super init];
-    if (self) {
-        self.requestsTable = [NSMapTable mapTableWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableWeakMemory];
-
-        self.taskQueue = [[NSOperationQueue alloc] init];
-        self.taskQueue.qualityOfService = NSQualityOfServiceUtility;
-        self.taskQueue.maxConcurrentOperationCount = 10;
-        self.rebindProgressDict = [NSMutableDictionary dictionary];
-        self.rebindUploadProgressDict = [NSMutableDictionary dictionary];
-    }
-
-    return self;
-}
-
-+ (ReactNativeBlobUtilNetwork* _Nullable)sharedInstance {
-    static id _sharedInstance = nil;
-    static dispatch_once_t onceToken;
-
-    dispatch_once(&onceToken, ^{
-        _sharedInstance = [[self alloc] init];
-    });
-
-    return _sharedInstance;
-}
-
-- (void) sendRequest:(__weak NSDictionary  * _Nullable )options
-       contentLength:(long) contentLength
-              baseModule:(ReactNativeBlobUtil * _Nullable)baseModule
-              taskId:(NSString * _Nullable)taskId
-         withRequest:(__weak NSURLRequest * _Nullable)req
-            callback:(_Nullable RCTResponseSenderBlock) callback
-{
-    ReactNativeBlobUtilRequest *request = [[ReactNativeBlobUtilRequest alloc] init];
-    [request sendRequest:options
-           contentLength:contentLength
-              baseModule:baseModule
-                  taskId:taskId
-             withRequest:req
-      taskOperationQueue:self.taskQueue
-                callback:callback];
-
-    @synchronized([ReactNativeBlobUtilNetwork class]) {
-        [self.requestsTable setObject:request forKey:taskId];
-        [self checkProgressConfigForTask:taskId];
-    }
-}
-
-- (void) checkProgressConfigForTask:(NSString *)taskId {
-    //reconfig progress
-    ReactNativeBlobUtilProgress *downloadConfig = self.rebindProgressDict[taskId];
-    if (downloadConfig != nil) {
-        [self enableProgressReport:taskId config:downloadConfig];
-        [self.rebindProgressDict removeObjectForKey:taskId];
-    }
-
-    //reconfig uploadProgress
-    ReactNativeBlobUtilProgress *uploadConfig = self.rebindUploadProgressDict[taskId];
-    if (uploadConfig != nil) {
-        [self enableUploadProgress:taskId config:uploadConfig];
-        [self.rebindUploadProgressDict removeObjectForKey:taskId];
-    }
-}
-
-- (void) enableProgressReport:(NSString *) taskId config:(ReactNativeBlobUtilProgress *)config
-{
-    if (config) {
-        @synchronized ([ReactNativeBlobUtilNetwork class]) {
-            if (![self.requestsTable objectForKey:taskId]) {
-                [self.rebindProgressDict setValue:config forKey:taskId];
-            } else {
-                [self.requestsTable objectForKey:taskId].progressConfig = config;
-            }
-        }
-    }
-}
-
-- (void) enableUploadProgress:(NSString *) taskId config:(ReactNativeBlobUtilProgress *)config
-{
-    if (config) {
-        @synchronized ([ReactNativeBlobUtilNetwork class]) {
-            if (![self.requestsTable objectForKey:taskId]) {
-                [self.rebindUploadProgressDict setValue:config forKey:taskId];
-            } else {
-                [self.requestsTable objectForKey:taskId].uploadProgressConfig = config;
-            }
-        }
-    }
-}
-
-- (void) cancelRequest:(NSString *)taskId
-{
-    NSURLSessionDataTask * task;
-
-    @synchronized ([ReactNativeBlobUtilNetwork 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;
-}
-
-@end
+//
+//  ReactNativeBlobUtilNetwork.m
+//  ReactNativeBlobUtil
+//
+//  Created by wkh237 on 2016/6/6.
+//  Copyright © 2016 wkh237. All rights reserved.
+//
+
+
+#import <Foundation/Foundation.h>
+#import "ReactNativeBlobUtilNetwork.h"
+
+#import "ReactNativeBlobUtilConst.h"
+#import "ReactNativeBlobUtilProgress.h"
+
+#if __has_include(<React/RCTAssert.h>)
+#import <React/RCTRootView.h>
+#import <React/RCTLog.h>
+#import <React/RCTBridge.h>
+#else
+#import "RCTRootView.h"
+#import "RCTLog.h"
+#import "RCTBridge.h"
+#endif
+
+////////////////////////////////////////
+//
+//  HTTP request handler
+//
+////////////////////////////////////////
+
+NSMapTable * expirationTable;
+
+__attribute__((constructor))
+static void initialize_tables() {
+    if (expirationTable == nil) {
+        expirationTable = [[NSMapTable alloc] init];
+    }
+}
+
+
+@implementation ReactNativeBlobUtilNetwork
+
+
+- (id)init {
+    self = [super init];
+    if (self) {
+        self.requestsTable = [NSMapTable mapTableWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableWeakMemory];
+
+        self.taskQueue = [[NSOperationQueue alloc] init];
+        self.taskQueue.qualityOfService = NSQualityOfServiceUtility;
+        self.taskQueue.maxConcurrentOperationCount = 10;
+        self.rebindProgressDict = [NSMutableDictionary dictionary];
+        self.rebindUploadProgressDict = [NSMutableDictionary dictionary];
+    }
+
+    return self;
+}
+
++ (ReactNativeBlobUtilNetwork* _Nullable)sharedInstance {
+    static id _sharedInstance = nil;
+    static dispatch_once_t onceToken;
+
+    dispatch_once(&onceToken, ^{
+        _sharedInstance = [[self alloc] init];
+    });
+
+    return _sharedInstance;
+}
+
+- (void) sendRequest:(__weak NSDictionary  * _Nullable )options
+       contentLength:(long) contentLength
+              baseModule:(ReactNativeBlobUtil * _Nullable)baseModule
+              taskId:(NSString * _Nullable)taskId
+         withRequest:(__weak NSURLRequest * _Nullable)req
+            callback:(_Nullable RCTResponseSenderBlock) callback
+{
+    ReactNativeBlobUtilRequest *request = [[ReactNativeBlobUtilRequest alloc] init];
+    [request sendRequest:options
+           contentLength:contentLength
+              baseModule:baseModule
+                  taskId:taskId
+             withRequest:req
+      taskOperationQueue:self.taskQueue
+                callback:callback];
+
+    @synchronized([ReactNativeBlobUtilNetwork class]) {
+        [self.requestsTable setObject:request forKey:taskId];
+        [self checkProgressConfigForTask:taskId];
+    }
+}
+
+- (void) checkProgressConfigForTask:(NSString *)taskId {
+    //reconfig progress
+    ReactNativeBlobUtilProgress *downloadConfig = self.rebindProgressDict[taskId];
+    if (downloadConfig != nil) {
+        [self enableProgressReport:taskId config:downloadConfig];
+        [self.rebindProgressDict removeObjectForKey:taskId];
+    }
+
+    //reconfig uploadProgress
+    ReactNativeBlobUtilProgress *uploadConfig = self.rebindUploadProgressDict[taskId];
+    if (uploadConfig != nil) {
+        [self enableUploadProgress:taskId config:uploadConfig];
+        [self.rebindUploadProgressDict removeObjectForKey:taskId];
+    }
+}
+
+- (void) enableProgressReport:(NSString *) taskId config:(ReactNativeBlobUtilProgress *)config
+{
+    if (config) {
+        @synchronized ([ReactNativeBlobUtilNetwork class]) {
+            if (![self.requestsTable objectForKey:taskId]) {
+                [self.rebindProgressDict setValue:config forKey:taskId];
+            } else {
+                [self.requestsTable objectForKey:taskId].progressConfig = config;
+            }
+        }
+    }
+}
+
+- (void) enableUploadProgress:(NSString *) taskId config:(ReactNativeBlobUtilProgress *)config
+{
+    if (config) {
+        @synchronized ([ReactNativeBlobUtilNetwork class]) {
+            if (![self.requestsTable objectForKey:taskId]) {
+                [self.rebindUploadProgressDict setValue:config forKey:taskId];
+            } else {
+                [self.requestsTable objectForKey:taskId].uploadProgressConfig = config;
+            }
+        }
+    }
+}
+
+- (void) cancelRequest:(NSString *)taskId
+{
+    NSURLSessionDataTask * task;
+
+    @synchronized ([ReactNativeBlobUtilNetwork 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;
+}
+
+@end

package/ios/ReactNativeBlobUtilProgress.h

@@ -1,32 +1,32 @@
-//
-//  ReactNativeBlobUtilProgress.h
-//  ReactNativeBlobUtil
-//
-//  Created by Ben Hsieh on 2016/9/25.
-//  Copyright © 2016年 wkh237.github.io. All rights reserved.
-//
-
-#ifndef ReactNativeBlobUtilProgress_h
-#define ReactNativeBlobUtilProgress_h
-
-#import <Foundation/Foundation.h>
-
-typedef NS_ENUM(NSUInteger, ProgressType) {
-    Download,
-    Upload,
-};
-
-@interface ReactNativeBlobUtilProgress : NSObject
-
-@property (nonatomic) NSNumber * count;
-@property (nonatomic) NSNumber * interval;
-@property (nonatomic) NSInteger type;
-@property (nonatomic) BOOL enable;
-
--(id)initWithType:(ProgressType)type interval:(NSNumber*)interval count:(NSNumber *)count;
--(BOOL)shouldReport:(NSNumber *) nextProgress;
-
-
-@end
-
-#endif /* ReactNativeBlobUtilProgress_h */
+//
+//  ReactNativeBlobUtilProgress.h
+//  ReactNativeBlobUtil
+//
+//  Created by Ben Hsieh on 2016/9/25.
+//  Copyright © 2016年 wkh237.github.io. All rights reserved.
+//
+
+#ifndef ReactNativeBlobUtilProgress_h
+#define ReactNativeBlobUtilProgress_h
+
+#import <Foundation/Foundation.h>
+
+typedef NS_ENUM(NSUInteger, ProgressType) {
+    Download,
+    Upload,
+};
+
+@interface ReactNativeBlobUtilProgress : NSObject
+
+@property (nonatomic) NSNumber * count;
+@property (nonatomic) NSNumber * interval;
+@property (nonatomic) NSInteger type;
+@property (nonatomic) BOOL enable;
+
+-(id)initWithType:(ProgressType)type interval:(NSNumber*)interval count:(NSNumber *)count;
+-(BOOL)shouldReport:(NSNumber *) nextProgress;
+
+
+@end
+
+#endif /* ReactNativeBlobUtilProgress_h */