fix: improved typings, fileCopyUri to include empty hostname

Author: vonovak

android/src/main/java/com/reactnativedocumentpicker/DocumentPickerModule.java

@@ -267,6 +267,8 @@ private WritableMap getMetadata(Uri uri) {
           if (!cursor.isNull(displayNameIndex)) {
             String fileName = cursor.getString(displayNameIndex);
             map.putString(FIELD_NAME, fileName);
+          } else {
+            map.putNull(FIELD_NAME);
           }
           int mimeIndex = cursor.getColumnIndex(DocumentsContract.Document.COLUMN_MIME_TYPE);
           if (!cursor.isNull(mimeIndex)) {
@@ -275,6 +277,8 @@ private WritableMap getMetadata(Uri uri) {
           int sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE);
           if (!cursor.isNull(sizeIndex)) {
             map.putInt(FIELD_SIZE, cursor.getInt(sizeIndex));
+          } else {
+            map.putNull(FIELD_SIZE);
           }
         }
       }
@@ -284,63 +288,48 @@ private WritableMap getMetadata(Uri uri) {
     }
 
     private void prepareFileUri(Context context, WritableMap map, Uri uri) {
-      if (copyTo != null) {
-        File dir = context.getCacheDir();
-        if (copyTo.equals("documentDirectory")) {
-          dir = context.getFilesDir();
-        }
-        // we don't want to rename the file so we put it into a unique location
-        dir = new File(dir, UUID.randomUUID().toString());
-        try {
-          boolean didCreateDir = dir.mkdir();
-          if (!didCreateDir) {
-            throw new IOException("failed to create directory at " + dir.getAbsolutePath());
-          }
-          String fileName = map.getString(FIELD_NAME);
-          if (fileName == null) {
-            fileName = String.valueOf(System.currentTimeMillis());
-          }
-          File destFile = new File(dir, fileName);
-          String copyPath = copyFile(context, uri, destFile);
-          map.putString(FIELD_FILE_COPY_URI, copyPath);
-        } catch (Exception e) {
-          e.printStackTrace();
-          map.putNull(FIELD_FILE_COPY_URI);
-          map.putString(FIELD_COPY_ERROR, e.getLocalizedMessage());
-        }
-      } else {
+      if (copyTo == null) {
         map.putNull(FIELD_FILE_COPY_URI);
+      } else {
+        copyFileToLocalStorage(context, map, uri);
       }
     }
 
-    public static String copyFile(Context context, Uri uri, File destFile) throws IOException {
-      InputStream in = null;
-      FileOutputStream out = null;
+    private void copyFileToLocalStorage(Context context, WritableMap map, Uri uri) {
+      File dir = context.getCacheDir();
+      if (copyTo.equals("documentDirectory")) {
+        dir = context.getFilesDir();
+      }
+      // we don't want to rename the file so we put it into a unique location
+      dir = new File(dir, UUID.randomUUID().toString());
       try {
-        in = context.getContentResolver().openInputStream(uri);
-        if (in != null) {
-          out = new FileOutputStream(destFile);
-          byte[] buffer = new byte[1024];
-          int len;
-          while ((len = in.read(buffer)) > 0) {
-            out.write(buffer, 0, len);
-          }
-          out.close();
-          in.close();
-          return destFile.toURI().toString();
-        } else {
-          throw new NullPointerException("Invalid input stream");
+        boolean didCreateDir = dir.mkdir();
+        if (!didCreateDir) {
+          throw new IOException("failed to create directory at " + dir.getAbsolutePath());
         }
+        String fileName = map.getString(FIELD_NAME);
+        if (fileName == null) {
+          fileName = String.valueOf(System.currentTimeMillis());
+        }
+        File destFile = new File(dir, fileName);
+        Uri copyPath = copyFile(context, uri, destFile);
+        map.putString(FIELD_FILE_COPY_URI, copyPath.toString());
       } catch (Exception e) {
-        try {
-          if (in != null) {
-            in.close();
-          }
-          if (out != null) {
-            out.close();
-          }
-        } catch (IOException ignored) {}
-        throw e;
+        e.printStackTrace();
+        map.putNull(FIELD_FILE_COPY_URI);
+        map.putString(FIELD_COPY_ERROR, e.getLocalizedMessage());
+      }
+    }
+
+    public static Uri copyFile(Context context, Uri uri, File destFile) throws IOException {
+      try(InputStream inputStream = context.getContentResolver().openInputStream(uri);
+          FileOutputStream outputStream = new FileOutputStream(destFile)) {
+        byte[] buf = new byte[8192];
+        int len;
+        while ((len = inputStream.read(buf)) > 0) {
+          outputStream.write(buf, 0, len);
+        }
+        return Uri.fromFile(destFile);
       }
     }
   }

src/index.tsx

@@ -5,7 +5,7 @@ import { perPlatformTypes } from './fileTypes'
 
 export type DocumentPickerResponse = {
   uri: string
-  name: string
+  name: string | null
   copyError?: string
   fileCopyUri: string | null
   type: string | null