react-native-blob-util 0.18.5 → 0.19.0

package/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilMediaCollection.java

@@ -95,8 +95,12 @@ public class ReactNativeBlobUtilMediaCollection {
 
             Uri mediauri = getMediaUri(mt);
 
-            // Keeps a handle to the new file's URI in case we need to modify it later.
-            return resolver.insert(mediauri, fileDetails);
+            try {
+                // Keeps a handle to the new file's URI in case we need to modify it later.
+                return resolver.insert(mediauri, fileDetails);
+            } catch (Exception e) {
+                return null;
+            }
         } else {
             File f = new File(relativePath + file.getFullPath());
             if (true) {

package/fetch.js

@@ -13,7 +13,6 @@ const eventEmitter = new NativeEventEmitter(ReactNativeBlobUtil);
 eventEmitter.addListener('ReactNativeBlobUtilMessage', (e) => {
     if (typeof e === 'string') e = JSON.parse(e);
 
-    console.log('add listener')
     if (e.event === 'warn') {
         console.warn(e.detail);
     }

package/ios/ReactNativeBlobUtilProgress.h

@@ -17,13 +17,6 @@ typedef NS_ENUM(NSUInteger, ProgressType) {
 };
 
 @interface ReactNativeBlobUtilProgress : NSObject
-{
-    NSNumber * count;
-    NSNumber * interval;
-    ProgressType type;
-    BOOL enable;
-    
-}
 
 @property (nonatomic) NSNumber * count;
 @property (nonatomic) NSNumber * interval;

package/ios/ReactNativeBlobUtilRequest.mm

@@ -349,17 +349,35 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
         return;
     }
 
-    NSNumber * now =[NSNumber numberWithFloat:((float)receivedBytes/(float)expectedBytes)];
+    // For non-chunked download, progress is received / expected
+    // For chunked download, progress can be either 0 (started) or 1 (ended)
+    NSNumber *now;
+    if (expectedBytes != NSURLResponseUnknownLength) {
+        now = [NSNumber numberWithFloat:((float)receivedBytes/(float)expectedBytes)];
+    } else {
+        now = @0;
+    }
 
     if ([self.progressConfig shouldReport:now]) {
-        [self.baseModule emitEventDict :EVENT_PROGRESS
-         body:@{
+        NSDictionary *body;
+        if (expectedBytes == NSURLResponseUnknownLength) {
+            // For chunked downloads
+            body = @{
+                @"taskId": taskId,
+                @"written": [NSString stringWithFormat:@"%d", 0],
+                @"total": [NSString stringWithFormat:@"%lld", (long long) expectedBytes],
+                @"chunk": chunkString,
+            };
+        } else {
+            // For non-chunked downloads
+            body = @{
                 @"taskId": taskId,
                 @"written": [NSString stringWithFormat:@"%lld", (long long) receivedBytes],
                 @"total": [NSString stringWithFormat:@"%lld", (long long) expectedBytes],
-                @"chunk": chunkString
-                }
-        ];
+                @"chunk": chunkString,
+            };
+        }
+        [self.baseModule emitEventDict:EVENT_PROGRESS body:body];
     }
 }
 
@@ -392,6 +410,14 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
         } else {
             errMsg = [error localizedDescription];
         }
+    } else if ([self.progressConfig shouldReport:@1] && expectedBytes == NSURLResponseUnknownLength) {
+        // For chunked downloads
+        [self.baseModule emitEventDict:EVENT_PROGRESS body:@{
+            @"taskId": taskId,
+            @"written": [NSString stringWithFormat:@"%lld", (long long) receivedBytes],
+            @"total": [NSString stringWithFormat:@"%lld", (long long) receivedBytes],
+            @"chunk": @"",
+        }];
     }
 
     if (respFile) {

package/package.json

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

package/react-native-blob-util.podspec

@@ -17,7 +17,29 @@ Pod::Spec.new do |s|
   s.framework    = 'AssetsLibrary'
 
   if fabric_enabled
-    install_modules_dependencies(s)
+    # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
+    # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.
+    if respond_to?(:install_modules_dependencies, true)
+      install_modules_dependencies(s)
+    else
+      # just for backward compatibility: if React Native version <= 0.70.x
+      s.compiler_flags = "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32 -DRCT_NEW_ARCH_ENABLED=1"
+      s.pod_target_xcconfig    = {
+        "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\"",
+        "OTHER_CPLUSPLUSFLAGS" => "-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1",
+        "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
+      }
+
+      s.dependency 'React-Core'
+      s.dependency "React-Codegen"
+      s.dependency "React-RCTFabric"
+      s.dependency "RCT-Folly"
+      s.dependency "RCTRequired"
+      s.dependency "RCTTypeSafety"
+      s.dependency "ReactCommon/turbomodule/core"
+    end
+  else
+    s.dependency 'React-Core'
   end
 
 end