react-native-blob-util 0.17.1 → 0.17.2

package/android/build.gradle

@@ -59,6 +59,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+       sourceCompatibility JavaVersion.VERSION_1_8
+       targetCompatibility JavaVersion.VERSION_1_8
+    }
     lintOptions {
         abortOnError false
     }
@@ -157,4 +161,4 @@ afterEvaluate { project ->
             }
         }
     }
-}
+}

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

@@ -355,7 +355,11 @@ class ReactNativeBlobUtilFS {
             } else {
                 res.put("SDCardApplicationDir", "");
             }
+        } else {
+            res.put("SDCardDir", "");
+            res.put("SDCardApplicationDir", "");
         }
+
         res.put("MainBundleDir", ctx.getApplicationInfo().dataDir);
 
         // TODO Change me with the correct path
@@ -376,7 +380,20 @@ class ReactNativeBlobUtilFS {
     static Map<String, Object> getLegacySystemfolders(ReactApplicationContext ctx) {
         Map<String, Object> res = new HashMap<>();
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) return ReactNativeBlobUtilFS.getSystemfolders(ctx);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            res = ReactNativeBlobUtilFS.getSystemfolders(ctx);
+
+            // Include legacy folders anyway, since on the new arch compatibility between the spec and the turbomodule is enforced
+            res.put("LegacyDCIMDir", "");
+            res.put("LegacyPictureDir", "");
+            res.put("LegacyMusicDir", "");
+            res.put("LegacyDownloadDir", "");
+            res.put("LegacyMovieDir", "");
+            res.put("LegacyRingtoneDir", "");
+            res.put("LegacySDCardDir", "");
+            
+            return res;
+        }
 
         res.put("LegacyDCIMDir", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath());
         res.put("LegacyPictureDir", Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES).getAbsolutePath());
@@ -388,6 +405,8 @@ class ReactNativeBlobUtilFS {
         String state = Environment.getExternalStorageState();
         if (state.equals(Environment.MEDIA_MOUNTED)) {
             res.put("LegacySDCardDir", Environment.getExternalStorageDirectory().getAbsolutePath());
+        } else {
+            res.put("LegacySDCardDir", "");
         }
 
         return res;

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

@@ -155,8 +155,8 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
     }
 
     public static void cancelTask(String taskId) {
-        if (taskTable.containsKey(taskId)) {
-            Call call = taskTable.get(taskId);
+        Call call = taskTable.get(taskId);
+        if (call != null) {
             call.cancel();
             taskTable.remove(taskId);
         }

package/class/ReactNativeBlobUtilCanceledFetchError.js

@@ -0,0 +1,10 @@
+const CANCELED_FETCH_ERROR_NAME = 'ReactNativeBlobUtilCanceledFetch'
+
+class CanceledFetchError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = CANCELED_FETCH_ERROR_NAME
+    }
+}
+
+export default CanceledFetchError

package/codegenSpecs/NativeBlobUtils.js

@@ -18,6 +18,14 @@ export interface Spec extends TurboModule {
         SDCardDir: string,
         SDCardApplicationDir: string,
         DCIMDir: string,
+        // Android Only Legacy Constants
+        LegacyDCIMDir: string,
+        LegacyPictureDir: string,
+        LegacyMusicDir: string,
+        LegacyDownloadDir: string,
+        LegacyMovieDir: string,
+        LegacyRingtoneDir: string,
+        LegacySDCardDir: string,
     |};
 
     +fetchBlobForm: (options: Object, taskId: string, method: string, url: string, headers: Object, form: Array<any>, callback: (value: Array<any>) => void) => void;

package/fetch.js

@@ -4,6 +4,7 @@ import fs from "./fs";
 import getUUID from "./utils/uuid";
 import {DeviceEventEmitter} from "react-native";
 import {FetchBlobResponse} from "./class/ReactNativeBlobUtilBlobResponse";
+import CanceledFetchError from "./class/ReactNativeBlobUtilCanceledFetchError";
 import ReactNativeBlobUtil from "./codegenSpecs/NativeBlobUtils";
 
 const emitter = DeviceEventEmitter;
@@ -328,7 +329,7 @@ export function fetch(...args: any): Promise {
         subscriptionUpload.remove();
         stateEvent.remove();
         ReactNativeBlobUtil.cancelRequest(taskId, fn);
-        promiseReject(new Error("canceled"));
+        promiseReject(new CanceledFetchError("canceled"));
     };
     promise.taskId = taskId;
 

package/index.d.ts

@@ -7,6 +7,7 @@ export const ReactNativeBlobUtil: ReactNativeBlobUtilStatic;
 export type ReactNativeBlobUtil = ReactNativeBlobUtilStatic;
 export default ReactNativeBlobUtil;
 import {filedescriptor} from './types';
+import CanceledFetchError from './class/ReactNativeBlobUtilCanceledFetchError'
 
 interface ReactNativeBlobUtilStatic {
     fetch(method: Methods, url: string, headers?: { [key: string]: string }, body?: any
@@ -29,6 +30,7 @@ interface ReactNativeBlobUtilStatic {
     polyfill: Polyfill;
     // this require external module https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/oboe
     JSONStream: any;
+    CanceledFetchError: CanceledFetchError
 }
 
 export interface Polyfill {

package/index.js

@@ -15,6 +15,7 @@ import ios from './ios';
 import JSONStream from './json-stream';
 import {config, fetch} from './fetch';
 import URIUtil from "./utils/uri";
+import CanceledFetchError from "./class/ReactNativeBlobUtilCanceledFetchError";
 
 const {
     ReactNativeBlobUtilSession,
@@ -70,5 +71,6 @@ export default {
     wrap,
     polyfill,
     JSONStream,
-    MediaCollection
+    MediaCollection,
+    CanceledFetchError
 };

package/ios/ReactNativeBlobUtil/ReactNativeBlobUtil.mm

@@ -12,7 +12,7 @@
 #import "ReactNativeBlobUtilProgress.h"
 
 #if RCT_NEW_ARCH_ENABLED
-#import "ReactNativeBlobUtilSpec.h"
+#import <ReactNativeBlobUtilSpec/ReactNativeBlobUtilSpec.h>
 #endif
 
 __strong RCTEventDispatcher * eventDispatcherRef;
@@ -95,6 +95,14 @@ RCT_EXPORT_MODULE();
              @"SDCardDir": @"",
              @"SDCardApplicationDir": @"",
              @"DCIMDir": @"",
+             // Android only legacy constants 
+             @"LegacyDCIMDir": @"",
+             @"LegacyPictureDir": @"",
+             @"LegacyMusicDir": @"",
+             @"LegacyDownloadDir": @"",
+             @"LegacyMovieDir": @"",
+             @"LegacyRingtoneDir": @"",
+             @"LegacySDCardDir": @"",
              };
 }
 
@@ -677,7 +685,7 @@ RCT_EXPORT_METHOD(hash:(NSString *)path
 }
 
 #pragma mark - fs.readStream
-RCT_EXPORT_METHOD(readStream:(NSString *)path withEncoding:(NSString *)encoding bufferSize:(int)bufferSize tick:(int)tick streamId:(NSString *)streamId)
+RCT_EXPORT_METHOD(readStream:(NSString *)path encoding:(NSString *)encoding bufferSize:(int)bufferSize tick:(int)tick streamId:(NSString *)streamId)
 {
     if(bufferSize == 0) {
         if([[encoding lowercaseString] isEqualToString:@"base64"])
@@ -902,7 +910,7 @@ RCT_EXPORT_METHOD(emitExpiredEvent:(RCTResponseSenderBlock)callback)
 }
 - (void)copyToMediaStore:(NSDictionary *)filedata
                       mt:(NSString *) mt
-                    path:(NSString *)
+                    path:(NSString *) path
                  resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject
 {
@@ -955,7 +963,6 @@ RCT_EXPORT_METHOD(emitExpiredEvent:(RCTResponseSenderBlock)callback)
     reject(@"ENOT_SUPPORTED", @"This method is not supported on iOS", nil);
 }
 
-
 # pragma mark - New Architecture
 #if RCT_NEW_ARCH_ENABLED
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:

package/ios/ReactNativeBlobUtilFS.mm

@@ -411,9 +411,9 @@ NSMutableDictionary *fileStreams = nil;
             [fileHandle closeFile];
         }
         else {
-            if (![content writeToFile:path atomically:YES]) {
+            if (![content writeToFile:path options:NSDataWritingAtomic error:&err]) {
                 fm = nil;
-                return reject(@"EUNSPECIFIED", [NSString stringWithFormat:@"File '%@' could not be written.", path], nil);
+                return reject(@"EUNSPECIFIED", [NSString stringWithFormat:@"File '%@' could not be written; error: %@", path, [err description]], err);
             }
         }
         fm = nil;

package/package.json

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

package/polyfill/Fetch.js

@@ -40,7 +40,10 @@ class ReactNativeBlobUtilFetchPolyfill {
                     log.verbose('convert FormData to blob body');
                     promise = Blob.build(body).then((b) => {
                         blobCache = b;
-                        options.headers['Content-Type'] = 'multipart/form-data;boundary=' + b.multipartBoundary;
+
+                        const contentType = 'multipart/form-data;boundary=' + b.multipartBoundary
+                        options.headers['Content-Type'] = contentType;
+                        options.headers['content-type'] = contentType;
                         return Promise.resolve(URIUtil.wrap(b._ref));
                     });
                 }