Merge pull request #222 from j-piasecki/patch-1

Add legacy constants to the module spec

Author: RonRadtke

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

@@ -355,7 +355,11 @@ static Map<String, Object> getSystemfolders(ReactApplicationContext ctx) {
             } 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 @@ static Map<String, Object> getSystemfolders(ReactApplicationContext ctx) {
     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 @@ static Map<String, Object> getLegacySystemfolders(ReactApplicationContext ctx) {
         String state = Environment.getExternalStorageState();
         if (state.equals(Environment.MEDIA_MOUNTED)) {
             res.put("LegacySDCardDir", Environment.getExternalStorageDirectory().getAbsolutePath());
+        } else {
+            res.put("LegacySDCardDir", "");
         }
 
         return res;

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;

ios/ReactNativeBlobUtil/ReactNativeBlobUtil.mm

@@ -95,6 +95,14 @@ - (NSDictionary *)constantsToExport
              @"SDCardDir": @"",
              @"SDCardApplicationDir": @"",
              @"DCIMDir": @"",
+             // Android only legacy constants 
+             @"LegacyDCIMDir": @"",
+             @"LegacyPictureDir": @"",
+             @"LegacyMusicDir": @"",
+             @"LegacyDownloadDir": @"",
+             @"LegacyMovieDir": @"",
+             @"LegacyRingtoneDir": @"",
+             @"LegacySDCardDir": @"",
              };
 }