fixing documentation and some promises

Author: Ron Radtke

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

@@ -9,6 +9,7 @@
 import android.util.SparseArray;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import androidx.core.content.FileProvider;
 
 import com.ReactNativeBlobUtil.Utils.FileDescription;
@@ -436,9 +437,11 @@ public void createMediaFile(ReadableMap filedata, String mt, Promise promise) {
         else promise.reject("ReactNativeBlobUtil.createMediaFile", "File could not be created");
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.Q)
     @ReactMethod
     public void writeToMediaFile(String fileUri, String path, Promise promise) {
-        ReactNativeBlobUtilMediaCollection.writeToMediaFile(Uri.parse(fileUri), path, promise);
+        boolean res = ReactNativeBlobUtilMediaCollection.writeToMediaFile(Uri.parse(fileUri), path, promise);
+        if(res) promise.resolve("Success");
     }
 
     @ReactMethod
@@ -451,6 +454,7 @@ public void getBlob(String contentUri, String encoding, Promise promise) {
         ReactNativeBlobUtilMediaCollection.getBlob(Uri.parse(contentUri), encoding, promise);
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.Q)
     @ReactMethod
     public void copyToMediaStore(ReadableMap filedata, String mt, String path, Promise promise) {
         if (!(filedata.hasKey("name") && filedata.hasKey("parentFolder") && filedata.hasKey("mimeType"))) {
@@ -470,7 +474,9 @@ public void copyToMediaStore(ReadableMap filedata, String mt, String path, Promi
             return;
         }
 
-        ReactNativeBlobUtilMediaCollection.writeToMediaFile(fileuri, path, promise);
+        boolean res = ReactNativeBlobUtilMediaCollection.writeToMediaFile(fileuri, path, promise);
+
+        if(res) promise.resolve(fileuri);
     }
 
 }

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

@@ -10,6 +10,8 @@
 import android.provider.MediaStore;
 import android.util.Base64;
 
+import androidx.annotation.RequiresApi;
+
 import com.ReactNativeBlobUtil.Utils.FileDescription;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
@@ -103,7 +105,8 @@ public static Uri createNewMediaFile(FileDescription file, MediaType mt) {
         return null;
     }
 
-    public static void writeToMediaFile(Uri fileUri, String data, Promise promise) {
+    @RequiresApi(api = Build.VERSION_CODES.Q)
+    public static boolean writeToMediaFile(Uri fileUri, String data, Promise promise) {
         try {
             Context appCtx = ReactNativeBlobUtil.RCTContext.getApplicationContext();
             ContentResolver resolver = appCtx.getContentResolver();
@@ -145,6 +148,8 @@ public static void writeToMediaFile(Uri fileUri, String data, Promise promise) {
                     descr.close();
                 } catch (Exception e) {
                     e.printStackTrace();
+                    promise.reject(new IOException("Failed to get output stream."));
+                    return false;
                 }
 
                 contentValues.clear();
@@ -153,15 +158,17 @@ public static void writeToMediaFile(Uri fileUri, String data, Promise promise) {
                 stream = resolver.openOutputStream(fileUri);
                 if (stream == null) {
                     promise.reject(new IOException("Failed to get output stream."));
+                    return false;
                 }
             } catch (IOException e) {
                 // Don't leave an orphan entry in the MediaStore
                 resolver.delete(uri, null, null);
                 promise.reject(e);
+                return false;
             } finally {
                 if (stream != null) {
                     stream.close();
-                    promise.resolve("");
+                    return true;
                 }
             }
 

index.d.ts

@@ -786,6 +786,7 @@ export type Mediatype = "Audio" | "Image" | "Video" | "Download";
 export interface MediaCollection {
     /**
      * Creates a new File in the collection.
+     * Promise will resolve to content UIR or error message
      * @param filedata descriptor for the media store entry
      * @param mediatype
      * @param path path of the file being copied
@@ -805,19 +806,19 @@ export interface MediaCollection {
      * @param uri URI of the destination mediastore file
      * @param path Path to the existing file which should be copied
      */
-    writeToMediafile(uri: string, path: string)
+    writeToMediafile(uri: string, path: string): Promise<string>
 
     /**
      * Copies a file from the mediastore to the apps internal storage
      * @param contenturi URI of the mediastore file
      * @param destpath Path for the file in the internal storage
      */
-    copyToInternal(contenturi: string, destpath: string)
+    copyToInternal(contenturi: string, destpath: string): Promise<string>
 
     /**
      * Gets the blob data for a given URI in the mediastore
      * @param contenturi
      * @param encoding
      */
-    getBlob(contenturi: string, encoding: string)
+    getBlob(contenturi: string, encoding: string): Promise<string>
 }