fixing the issue for corrupted files (when using file cache)

Author: Ron Radtke

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

@@ -70,7 +70,7 @@ static void writeFile(String path, String encoding, String data, final boolean a
 
             // write data from a file
             if (encoding.equalsIgnoreCase(ReactNativeBlobUtilConst.DATA_ENCODE_URI)) {
-                String normalizedData = normalizePath(data);
+                String normalizedData = ReactNativeBlobUtilUtils.normalizePath(data);
                 File src = new File(normalizedData);
                 if (!src.exists()) {
                     promise.reject("ENOENT", "No such file '" + path + "' " + "('" + normalizedData + "')");
@@ -97,7 +97,7 @@ static void writeFile(String path, String encoding, String data, final boolean a
                     }
                 }
             } else {
-                byte[] bytes = stringToBytes(data, encoding);
+                byte[] bytes = ReactNativeBlobUtilUtils.stringToBytes(data, encoding);
                 FileOutputStream fout = new FileOutputStream(f, append);
                 try {
                     fout.write(bytes);
@@ -167,7 +167,7 @@ static void writeFile(String path, ReadableArray data, final boolean append, fin
      * @param promise  JS promise
      */
     static void readFile(String path, String encoding, final Promise promise) {
-        String resolved = normalizePath(path);
+        String resolved = ReactNativeBlobUtilUtils.normalizePath(path);
         if (resolved != null)
             path = resolved;
         try {
@@ -337,7 +337,7 @@ static String getTmpPath(String taskId) {
      * @param bufferSize Buffer size of read stream, default to 4096 (4095 when encode is `base64`)
      */
     void readStream(String path, String encoding, int bufferSize, int tick, final String streamId) {
-        String resolved = normalizePath(path);
+        String resolved = ReactNativeBlobUtilUtils.normalizePath(path);
         if (resolved != null)
             path = resolved;
 
@@ -480,7 +480,7 @@ void writeStream(String path, String encoding, boolean append, Callback callback
     static void writeChunk(String streamId, String data, Callback callback) {
         ReactNativeBlobUtilFS fs = fileStreams.get(streamId);
         OutputStream stream = fs.writeStreamInstance;
-        byte[] chunk = ReactNativeBlobUtilFS.stringToBytes(data, fs.encoding);
+        byte[] chunk = ReactNativeBlobUtilUtils.stringToBytes(data, fs.encoding);
         try {
             stream.write(chunk);
             callback.invoke();
@@ -537,7 +537,7 @@ static void closeStream(String streamId, Callback callback) {
      */
     static void unlink(String path, Callback callback) {
         try {
-            String normalizedPath = normalizePath(path);
+            String normalizedPath = ReactNativeBlobUtilUtils.normalizePath(path);
             ReactNativeBlobUtilFS.deleteRecursive(new File(normalizedPath));
             callback.invoke(null, true);
         } catch (Exception err) {
@@ -595,7 +595,7 @@ static void mkdir(String path, Promise promise) {
      * @param callback JS context callback
      */
     static void cp(String path, String dest, Callback callback) {
-        path = normalizePath(path);
+        path = ReactNativeBlobUtilUtils.normalizePath(path);
         InputStream in = null;
         OutputStream out = null;
         String message = "";
@@ -700,7 +700,7 @@ static void exists(String path, Callback callback) {
                 callback.invoke(false, false);
             }
         } else {
-            path = normalizePath(path);
+            path = ReactNativeBlobUtilUtils.normalizePath(path);
             if (path != null) {
                 boolean exist = new File(path).exists();
                 boolean isDir = new File(path).isDirectory();
@@ -719,7 +719,7 @@ static void exists(String path, Callback callback) {
      */
     static void ls(String path, Promise promise) {
         try {
-            path = normalizePath(path);
+            path = ReactNativeBlobUtilUtils.normalizePath(path);
             File src = new File(path);
             if (!src.exists()) {
                 promise.reject("ENOENT", "No such file '" + path + "'");
@@ -754,7 +754,7 @@ static void ls(String path, Promise promise) {
      */
     static void slice(String path, String dest, int start, int end, String encode, Promise promise) {
         try {
-            path = normalizePath(path);
+            path = ReactNativeBlobUtilUtils.normalizePath(path);
             File source = new File(path);
             if (source.isDirectory()) {
                 promise.reject("EISDIR", "Expecting a file but '" + path + "' is a directory");
@@ -796,7 +796,7 @@ static void slice(String path, String dest, int start, int end, String encode, P
     }
 
     static void lstat(String path, final Callback callback) {
-        path = normalizePath(path);
+        path = ReactNativeBlobUtilUtils.normalizePath(path);
 
         new AsyncTask<String, Integer, Integer>() {
             @Override
@@ -835,7 +835,7 @@ protected Integer doInBackground(String... args) {
      */
     static void stat(String path, Callback callback) {
         try {
-            path = normalizePath(path);
+            path = ReactNativeBlobUtilUtils.normalizePath(path);
             WritableMap result = statFile(path);
             if (result == null)
                 callback.invoke("failed to stat path `" + path + "` because it does not exist or it is not a folder", null);
@@ -854,7 +854,7 @@ static void stat(String path, Callback callback) {
      */
     static WritableMap statFile(String path) {
         try {
-            path = normalizePath(path);
+            path = ReactNativeBlobUtilUtils.normalizePath(path);
             WritableMap stat = Arguments.createMap();
             if (isAsset(path)) {
                 String name = path.replace(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET, "");
@@ -990,7 +990,7 @@ static void createFile(String path, String data, String encoding, Promise promis
                     return;
                 }
                 OutputStream ostream = new FileOutputStream(dest);
-                ostream.write(ReactNativeBlobUtilFS.stringToBytes(data, encoding));
+                ostream.write(ReactNativeBlobUtilUtils.stringToBytes(data, encoding));
             }
             promise.resolve(path);
         } catch (Exception err) {
@@ -1085,25 +1085,6 @@ protected Integer doInBackground(ReadableArray... paths) {
         task.execute(paths);
     }
 
-    /**
-     * String to byte converter method
-     *
-     * @param data     Raw data in string format
-     * @param encoding Decoder name
-     * @return Converted data byte array
-     */
-    private static byte[] stringToBytes(String data, String encoding) {
-        if (encoding.equalsIgnoreCase("ascii")) {
-            return data.getBytes(Charset.forName("US-ASCII"));
-        } else if (encoding.toLowerCase().contains("base64")) {
-            return Base64.decode(data, Base64.NO_WRAP);
-
-        } else if (encoding.equalsIgnoreCase("utf8")) {
-            return data.getBytes(Charset.forName("UTF-8"));
-        }
-        return data.getBytes(Charset.forName("US-ASCII"));
-    }
-
     /**
      * Private method for emit read stream event.
      *
@@ -1174,26 +1155,4 @@ static boolean isAsset(String path) {
         return path != null && path.startsWith(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET);
     }
 
-    /**
-     * Normalize the path, remove URI scheme (xxx://) so that we can handle it.
-     *
-     * @param path URI string.
-     * @return Normalized string
-     */
-    static String normalizePath(String path) {
-        if (path == null)
-            return null;
-        if (!path.matches("\\w+\\:.*"))
-            return path;
-        if (path.startsWith("file://")) {
-            return path.replace("file://", "");
-        }
-
-        Uri uri = Uri.parse(path);
-        if (path.startsWith(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET)) {
-            return path;
-        } else
-            return PathResolver.getRealPathFromURI(ReactNativeBlobUtil.RCTContext, uri);
-    }
-
 }

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

@@ -6,12 +6,15 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
+import android.os.ParcelFileDescriptor;
 import android.provider.MediaStore;
 
 import com.ReactNativeBlobUtil.Utils.FileDescription;
 import com.facebook.react.bridge.Promise;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
@@ -107,9 +110,59 @@ public static void writeToMediaFile(Uri fileUri, String data, Promise promise) {
             resolver.update(fileUri, contentValues, null, null);
 
             // write data
-            OutputStream outputStream = resolver.openOutputStream(fileUri);
-            outputStream.write(data.getBytes());
-            outputStream.close();
+            //OutputStream outputStream = resolver.openOutputStream(fileUri);
+            //outputStream.write(data.getBytes());
+            //outputStream.close();
+
+            OutputStream stream = null;
+            Uri uri = null;
+
+            try {
+                ParcelFileDescriptor descr;
+                try {
+                    assert fileUri != null;
+                    descr = appCtx.getContentResolver().openFileDescriptor(fileUri, "w");
+                    assert descr != null;
+                    String normalizedData = ReactNativeBlobUtilUtils.normalizePath(data);
+                    File src = new File(normalizedData);
+                    if (!src.exists()) {
+                        promise.reject("ENOENT", "No such file ('" + normalizedData + "')");
+                        return;
+                    }
+                    byte[] buf = new byte[10240];
+                    int read;
+                    int written = 0;
+
+                    FileInputStream fin = new FileInputStream(src);
+                    FileOutputStream out = new FileOutputStream(descr.getFileDescriptor());
+
+                    while ((read = fin.read(buf)) > 0) {
+                        out.write(buf, 0, read);
+                    }
+
+                    fin.close();
+                    out.close();
+                    descr.close();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+                contentValues.clear();
+                contentValues.put(MediaStore.Video.Media.IS_PENDING, 0);
+                appCtx.getContentResolver().update(fileUri, contentValues, null, null);
+                stream = resolver.openOutputStream(fileUri);
+                if (stream == null) {
+                    throw new IOException("Failed to get output stream.");
+                }
+            } catch (IOException e) {
+                // Don't leave an orphan entry in the MediaStore
+                resolver.delete(uri, null, null);
+                throw e;
+            } finally {
+                if (stream != null) {
+                    stream.close();
+                }
+            }
 
             // remove pending
             contentValues = new ContentValues();