Fix IOS syntax errors in #489

Author: wkh237

ios/RNFetchBlob/RNFetchBlob.m

@@ -239,7 +239,7 @@ - (NSDictionary *)constantsToExport
     RNFetchBlobFS * fileStream = [[RNFetchBlobFS alloc] initWithBridgeRef:self.bridge];
     NSFileManager * fm = [NSFileManager defaultManager];
     NSString * folder = [path stringByDeletingLastPathComponent];
-
+    NSError* err = nil;
     BOOL isDir = NO;
     BOOL exists = [fm fileExistsAtPath:path isDirectory: &isDir];
 
@@ -257,7 +257,7 @@ - (NSDictionary *)constantsToExport
     }
 
     NSString * streamId = [fileStream openWithPath:path encode:encoding appendData:append];
-    callback(@[[NSNull null], @[NSNull null], streamId]);
+    callback(@[[NSNull null], [NSNull null], streamId]);
 }
 
 #pragma mark - fs.writeArrayChunk
@@ -467,7 +467,8 @@ - (NSDictionary *)constantsToExport
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 {
-    [RNFetchBlobFS readFile:path encoding:encoding onComplete:^(id content, NSString * code, NSString * err) {
+    
+    [RNFetchBlobFS readFile:path encoding:encoding onComplete:^(NSData * content, NSString * code, NSString * err) {
         if(err != nil) {
             reject(code, err, nil);
             return;

ios/RNFetchBlobFS.h

@@ -58,11 +58,16 @@
 // fs methods
 + (RNFetchBlobFS *) getFileStreams;
 + (BOOL) mkdir:(NSString *) path;
++ (void) mkdir:(NSString *) path resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject;
++ (void) hash:(NSString *)path
+    algorithm:(NSString *)algorithm
+     resolver:(RCTPromiseResolveBlock)resolve
+     rejecter:(RCTPromiseRejectBlock)reject;
 + (NSDictionary *) stat:(NSString *) path error:(NSError **) error;
 + (void) exists:(NSString *) path callback:(RCTResponseSenderBlock)callback;
 + (void) writeFileArray:(NSString *)path data:(NSArray *)data append:(BOOL)append resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject;
 + (void) writeFile:(NSString *)path encoding:(NSString *)encoding data:(NSString *)data append:(BOOL)append resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject;
-+ (void) readFile:(NSString *)path encoding:(NSString *)encoding onComplete:(void (^)(NSData * content, NSString * errMsg))onComplete;
++ (void) readFile:(NSString *)path encoding:(NSString *)encoding onComplete:(void (^)(NSData * content, NSString* code, NSString * errMsg))onComplete;
 + (void) readAssetFile:(NSData *)assetUrl completionBlock:(void(^)(NSData * content))completionBlock failBlock:(void(^)(NSError * err))failBlock;
 + (void) slice:(NSString *)path
          dest:(NSString *)dest

ios/RNFetchBlobFS.m

@@ -469,7 +469,7 @@ + (void) writeFileArray:(NSString *)path
 
 + (void) readFile:(NSString *)path
          encoding:(NSString *)encoding
-       onComplete:(void (^)(id content, NSString * codeStr, NSString * errMsg))onComplete
+       onComplete:(void (^)(NSData * content, NSString * codeStr, NSString * errMsg))onComplete
 {
     [[self class] getPathFromUri:path completionHandler:^(NSString *path, ALAssetRepresentation *asset) {
         __block NSData * fileContent;
@@ -535,10 +535,10 @@ + (void) readFile:(NSString *)path
 
 # pragma mark - hash
 
-RCT_EXPORT_METHOD(hash:(NSString *)path
++ (void) hash:(NSString *)path
                   algorithm:(NSString *)algorithm
                   resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
+                  rejecter:(RCTPromiseRejectBlock)reject
 {
     BOOL isDir = NO;
     BOOL exists = NO;
@@ -547,7 +547,7 @@ + (void) readFile:(NSString *)path
     if (isDir) {
         return reject(@"EISDIR", [NSString stringWithFormat:@"Expecting a file but '%@' is a directory", path], nil);
     }
-    if (!fileExists) {
+    if (!exists) {
         return reject(@"ENOENT", [NSString stringWithFormat:@"No such file '%@'", path], nil);
     }
 
@@ -556,11 +556,13 @@ + (void) readFile:(NSString *)path
     NSDictionary *attributes = [[NSFileManager defaultManager] attributesOfItemAtPath:path error:&error];
 
     if (error) {
-        return [self reject:reject withError:error];
+        reject(@"EUNKNOWN", [error description], nil);
+        return;
     }
 
     if ([attributes objectForKey:NSFileType] == NSFileTypeDirectory) {
-        return reject(@"EISDIR", [NSString stringWithFormat:@"Expecting a file but '%@' is a directory", path], nil);
+        reject(@"EISDIR", [NSString stringWithFormat:@"Expecting a file but '%@' is a directory", path], nil);
+        return;
     }
 
     NSData *content = [[NSFileManager defaultManager] contentsAtPath:path];
@@ -599,7 +601,8 @@ + (void) readFile:(NSString *)path
     } else if ([algorithm isEqualToString:@"sha512"]) {
         CC_SHA512(content.bytes, (CC_LONG)content.length, buffer);
     } else {
-        return reject(@"EINVAL", [NSString stringWithFormat:@"Invalid algorithm '%@', must be one of md5, sha1, sha224, sha256, sha384, sha512", algorithm], nil);
+        reject(@"EINVAL", [NSString stringWithFormat:@"Invalid algorithm '%@', must be one of md5, sha1, sha224, sha256, sha384, sha512", algorithm], nil);
+        return;
     }
 
     NSMutableString *output = [NSMutableString stringWithCapacity:digestLength * 2];

ios/RNFetchBlobReqBuilder.m

@@ -118,17 +118,17 @@ +(void) buildOctetRequest:(NSDictionary *)options
                     if([orgPath hasPrefix:AL_PREFIX])
                     {
 
-                        [RNFetchBlobFS readFile:orgPath encoding:nil onComplete:^(NSData *content, NSString * err) {
+                        [RNFetchBlobFS readFile:orgPath encoding:nil onComplete:^(id content, NSString* code, NSString * err) {
                             if(err != nil)
                             {
                                 onComplete(nil, nil);
                             }
                             else
                             {
-                                [request setHTTPBody:content];
+                                [request setHTTPBody:((NSData *)content)];
                                 [request setHTTPMethod: method];
                                 [request setAllHTTPHeaderFields:mheaders];
-                                onComplete(request, [content length]);
+                                onComplete(request, [((NSData *)content) length]);
                             }
                         }];
 
@@ -222,7 +222,7 @@ void __block (^getFieldData)(id field) = ^(id field)
                         NSString * orgPath = [content substringFromIndex:[FILE_PREFIX length]];
                         orgPath = [RNFetchBlobFS getPathOfAsset:orgPath];
 
-                        [RNFetchBlobFS readFile:orgPath encoding:nil onComplete:^(NSData *content, NSString * err) {
+                        [RNFetchBlobFS readFile:orgPath encoding:nil onComplete:^(NSData *content, NSString* code, NSString * err) {
                             if(err != nil)
                             {
                                 onComplete(formData, YES);