Add network status indicator support

README.md

@@ -1,4 +1,4 @@
-# react-native-fetch-blob [![npm version](https://img.shields.io/badge/npm package-0.5.5-brightgreen.svg)](https://badge.fury.io/js/react-native-fetch-blob) ![](https://img.shields.io/badge/PR-Welcome-brightgreen.svg) ![](https://img.shields.io/badge/in progress-0.6.0-yellow.svg)
+# react-native-fetch-blob [![npm version](https://img.shields.io/badge/npm package-0.5.6-brightgreen.svg)](https://badge.fury.io/js/react-native-fetch-blob) ![](https://img.shields.io/badge/PR-Welcome-brightgreen.svg) ![](https://img.shields.io/badge/in progress-0.6.0-yellow.svg)
 
 A module provides upload, download, and files access API. Supports file stream read/write for process large files.
 
@@ -847,6 +847,7 @@ A `session` is an object that helps you manage files. It simply maintains a list
 
 | Version | |
 |---|---|
+| 0.5.6 | Add support for IOS network status indicator. Fix file stream ASCII reader bug. |
 | 0.5.5 | Remove work in progress code added in 0.5.2 which may cause memory leaks. |
 | 0.5.4 | Fix #30 #31 build build error, and improve memory efficiency. |
 | 0.5.3 | Add API for access untrusted SSL server |

src/ios/RNFetchBlobConst.h

@@ -23,6 +23,7 @@ extern NSString *const CONFIG_USE_TEMP;
 extern NSString *const CONFIG_FILE_PATH;
 extern NSString *const CONFIG_FILE_EXT;
 extern NSString *const CONFIG_TRUSTY;
+extern NSString *const CONFIG_INDICATOR;
 
 // fs events
 extern NSString *const FS_EVENT_DATA;

src/ios/RNFetchBlobConst.m

@@ -14,6 +14,7 @@ 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 MSG_EVENT = @"RNFetchBlobMessage";

src/ios/RNFetchBlobFS.m

@@ -264,7 +264,8 @@ void runOnMainQueueWithoutDeadlocking(void (^block)(void))
                 chunkSize = 4095;
             if(self.bufferSize > 0)
                 chunkSize = self.bufferSize;
-            uint8_t * buf = (uint8_t *)malloc(chunkSize);
+//            uint8_t * buf = (uint8_t *)malloc(chunkSize);
+            uint8_t buf[chunkSize];
             unsigned int len = 0;
             len = [(NSInputStream *)stream read:buf maxLength:chunkSize];
             // still have data in stream
@@ -281,6 +282,7 @@ void runOnMainQueueWithoutDeadlocking(void (^block)(void))
                     NSString * asciiStr = @"[";
                     if (chunkData.length > 0)
                     {
+//                        unsigned char *bytePtr = (unsigned char *)[chunkData bytes];
                         unsigned char *bytePtr = (unsigned char *)[chunkData bytes];
                         NSInteger byteLen = chunkData.length/sizeof(uint8_t);
                         for (int i = 0; i < byteLen; i++)
@@ -291,7 +293,7 @@ void runOnMainQueueWithoutDeadlocking(void (^block)(void))
                             else
                                 asciiStr = [asciiStr stringByAppendingFormat:@"%d", val];
                         }
-                        free(bytePtr);
+//                        free(bytePtr);
                     }
                     asciiStr = [asciiStr stringByAppendingString:@"]"];
                     [self.bridge.eventDispatcher
@@ -301,10 +303,10 @@ void runOnMainQueueWithoutDeadlocking(void (^block)(void))
                              @"detail": asciiStr
                             }
                      ];
-                    free(buf);
-                    asciiStr = nil;
-                    buf = nil;
-                    chunkData = nil;
+//                    free(buf);
+//                    asciiStr = nil;
+//                    buf = nil;
+//                    chunkData = nil;
                     return;
                 }
                 // convert byte array to base64 data chunks
@@ -330,8 +332,8 @@ void runOnMainQueueWithoutDeadlocking(void (^block)(void))
                         @"detail": encodedChunk
                         }
                  ];
-                chunkData = nil;
-                free(buf);
+//                chunkData = nil;
+//                free(buf);
             }
             // end of stream
             else {
@@ -342,8 +344,8 @@ void runOnMainQueueWithoutDeadlocking(void (^block)(void))
                         @"detail": @""
                         }
                  ];
-                chunkData = nil;
-                free(buf);
+//                chunkData = nil;
+//                free(buf);
             }
             break;
         }

src/ios/RNFetchBlobNetwork.m

@@ -77,7 +77,7 @@ NSOperationQueue *taskQueue;
     if([options valueForKey:CONFIG_TRUSTY] != nil)
     {
         NSURLSessionConfiguration *defaultConfigObject = [NSURLSessionConfiguration defaultSessionConfiguration];
-        session = [NSURLSession sessionWithConfiguration:defaultConfigObject delegate:self delegateQueue:taskQueue];
+        session = [NSURLSession sessionWithConfiguration:defaultConfigObject delegate:self delegateQueue:[NSOperationQueue mainQueue]];
     }
     // the session validates SSL certification, self-signed certification will be aborted
     else
@@ -105,6 +105,7 @@ NSOperationQueue *taskQueue;
             callback(@[[NSNull null], path]);
             // prevent memory leaks
             self.respData = nil;
+            [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
         }];
         [task resume];
     }
@@ -127,6 +128,7 @@ NSOperationQueue *taskQueue;
                 return;
             }
             callback(@[[NSNull null], tmpPath]);
+            [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
             // prevent memory leaks
             self.respData = nil;
         }];
@@ -143,9 +145,15 @@ NSOperationQueue *taskQueue;
             else {
                 callback(@[[NSNull null], [resp base64EncodedStringWithOptions:0]]);
             }
+            self.respData = nil;
+            [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
         }];
         [task resume];
     }
+    
+    // network status indicator
+    if([[options objectForKey:CONFIG_INDICATOR] boolValue] == YES)
+        [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES];
 }
 
 ////////////////////////////////////////
@@ -188,6 +196,7 @@ NSOperationQueue *taskQueue;
 - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCompleteWithError:(NSError *)error {
     NSLog([error localizedDescription]);
     self.error = error;
+    [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
 }
 
 // upload progress handler
@@ -205,9 +214,9 @@ NSOperationQueue *taskQueue;
      ];
 }
 
-- (void) application:(UIApplication *)application handleEventsForBackgroundURLSession:(NSString *)identifier completionHandler:(void (^)())completionHandler {
-    
-}
+//- (void) application:(UIApplication *)application handleEventsForBackgroundURLSession:(NSString *)identifier completionHandler:(void (^)())completionHandler {
+//    
+//}
 
 //- (void) URLSessionDidFinishEventsForBackgroundURLSession:(NSURLSession *)session
 //{
@@ -225,8 +234,10 @@ NSOperationQueue *taskQueue;
 {
     if([options valueForKey:CONFIG_TRUSTY] != nil)
         completionHandler(NSURLSessionAuthChallengeUseCredential, [NSURLCredential credentialForTrust:challenge.protectionSpace.serverTrust]);
-    else
+    else {
         RCTLogWarn(@"counld not create connection with an unstrusted SSL certification, if you're going to create connection anyway, add `trusty:true` to RNFetchBlob.config");
+        [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
+    }
 }
 
 @end

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-fetch-blob",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "description": "A module provides upload, download, and files access API. Supports file stream read/write for process large files.",
   "main": "index.js",
   "scripts": {

src/types.js

@@ -3,7 +3,9 @@ type RNFetchBlobConfig = {
   fileCache : bool,
   path : string,
   appendExt : string,
-  session : string
+  session : string,
+  addAndroidDownloads : any,
+  indicator : bool
 };
 
 type RNFetchBlobNative = {