@react-native-documents/picker 10.1.3 → 10.1.5

package/android/src/main/java/com/reactnativedocumentpicker/FileOperations.kt

@@ -3,6 +3,8 @@ package com.reactnativedocumentpicker
 import android.content.ContentResolver
 import android.content.Context
 import android.net.Uri
+import android.os.Build
+import android.os.FileUtils
 import com.facebook.react.bridge.Arguments
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContext
@@ -18,7 +20,7 @@ import java.io.FileNotFoundException
 import java.io.FileOutputStream
 import java.io.IOException
 import java.io.InputStream
-import java.nio.channels.Channels
+import java.io.OutputStream
 import java.util.UUID
 
 class FileOperations(private val uriMap: MutableMap<String, Uri>) {
@@ -119,23 +121,17 @@ class FileOperations(private val uriMap: MutableMap<String, Uri>) {
     val destFileSafe = safeGetDestination(attemptedDestFile, destinationDir)
 
     val copyStreamToFile: (InputStream?) -> Unit = { inputStream ->
-      if (inputStream == null) {
-        throw FileNotFoundException("No input stream was found for the source file")
-      }
-      FileOutputStream(destFileSafe).channel.use { destinationFileChannel ->
-        val inputChannel = Channels.newChannel(inputStream)
-        val size = destinationFileChannel.transferFrom(inputChannel, 0, Long.MAX_VALUE)
-        if (size == 0L) {
-          throw IOException("No data was copied to the destination file")
-        }
+      inputStream ?: throw FileNotFoundException("No input stream was found for the source file")
+      val bytesCopied = copyStreamToAnother(inputStream, FileOutputStream(destFileSafe))
+      if (bytesCopied == 0L) {
+        throw IOException("No data was copied to the destination file")
       }
     }
 
     if (convertVirtualFileAsType == null) {
-      context.contentResolver.openInputStream(from).use(copyStreamToFile)
+      copyStreamToFile(context.contentResolver.openInputStream(from))
     } else {
-      getInputStreamForVirtualFile(context.contentResolver, from, convertVirtualFileAsType)
-        .use(copyStreamToFile)
+      copyStreamToFile(getInputStreamForVirtualFile(context.contentResolver, from, convertVirtualFileAsType))
     }
 
     return destFileSafe
@@ -161,9 +157,7 @@ class FileOperations(private val uriMap: MutableMap<String, Uri>) {
   }
 
   fun writeDocumentImpl(sourceUri: Uri?, targetUriString: String?, context: ReactApplicationContext): DocumentMetadataBuilder {
-    if (sourceUri == null) {
-      throw IllegalArgumentException("The source URI is null. Call saveDocument() before writeDocument()")
-    }
+    sourceUri ?:  throw IllegalArgumentException("The source URI is null. Call saveDocument() before writeDocument()")
     val targetUri: Uri? = uriMap[targetUriString]
 
     if (targetUri == null) {
@@ -180,25 +174,30 @@ class FileOperations(private val uriMap: MutableMap<String, Uri>) {
     val mimeFromUri = contentResolver.getType(targetUri)
     metadataBuilder.mimeType(mimeFromUri)
 
-    // TODO https://gist.github.com/vonovak/73affb1a5b904ee165d9b5981d8dfe9a
-    contentResolver.openInputStream(sourceUri).use { inputStream ->
-      if (inputStream == null) {
-        metadataBuilder.metadataReadingError("No output stream found for source file")
-      } else {
-        contentResolver.openOutputStream(targetUri).use { outputStream ->
-          if (outputStream == null) {
-            metadataBuilder.metadataReadingError("No output stream found for destination file")
-          } else {
-            val bytesCopied = inputStream.copyTo(outputStream)
-            if (bytesCopied == 0L) {
-              metadataBuilder.metadataReadingError("No data was copied to the destination file")
-            }
-            outputStream.flush()
-          }
-        }
-      }
+    val inputStream = contentResolver.openInputStream(sourceUri)
+      ?: return metadataBuilder.metadataReadingError("No input stream found for source file")
+
+    val outputStream = contentResolver.openOutputStream(targetUri)
+      ?: return metadataBuilder.metadataReadingError("No output stream found for destination file")
+
+    val bytesCopied = copyStreamToAnother(inputStream, outputStream)
+    if (bytesCopied == 0L) {
+      metadataBuilder.metadataReadingError("No data was copied to the destination file")
     }
 
     return metadataBuilder
   }
+
+  val copyStreamToAnother: (InputStream, OutputStream) -> Long = { inputStream, outputStream ->
+    inputStream.use { input ->
+      outputStream.use { output ->
+        val bytesCopied = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+          FileUtils.copy(inputStream, outputStream)
+        } else {
+          inputStream.copyTo(outputStream)
+        }
+        return@use bytesCopied
+      }
+    }
+  }
 }

package/ios/swift/DocPicker.swift

@@ -28,10 +28,10 @@ import MobileCoreServices
   }
 
   public func getMetadataFor(url: URL) throws -> DocumentMetadataBuilder {
-    if (currentOptions?.isOpenMode() == true) {
-      return try self.getOpenedDocumentInfo(url: url, requestLongTermAccess: currentOptions?.requestLongTermAccess ?? false)
+    return if (currentOptions?.isOpenMode() == true) {
+      try self.getOpenedDocumentInfo(url: url, requestLongTermAccess: currentOptions?.requestLongTermAccess ?? false)
     } else {
-      return try self.getAnyModeMetadata(url: url)
+      try self.getAnyModeMetadata(url: url)
     }
   }
 

package/ios/swift/FileOperations.swift

@@ -4,45 +4,47 @@ import Foundation
 
 @objc public class FileOperations: NSObject {
   
-  @objc public static func keepLocalCopyAtUniqueDestination(from: Array<Dictionary<String, String>>, destinationPreset: String, resolve: @escaping RNDPPromiseResolveBlock) {
-    Task {
-      let results = await moveFiles(from: from, destinationPreset: destinationPreset)
+  @objc public static func keepLocalCopyAtUniqueDestination(from: [[String: String]], destinationPreset: String, resolve: @escaping RNDPPromiseResolveBlock) {
+    DispatchQueue.global(qos: .utility).async {
+      let results = moveFiles(from: from, destinationPreset: destinationPreset)
       resolve(results)
     }
   }
   
-  static func moveFiles(from: Array<Dictionary<String, String>>, destinationPreset: String) async -> [[String: String?]] {
+  static func moveFiles(from: [[String: String]], destinationPreset: String) -> [[String: String?]] {
     let destinationRootDir = getDirectoryForFileDestination(destinationPreset)
     let uniqueSubDirName = UUID().uuidString
-    let destinationDir: URL = destinationRootDir.appendingPathComponent("\(uniqueSubDirName)/", isDirectory: true)
-    // TODO do we need all of this Task dance?
+    let destinationDir = destinationRootDir.appendingPathComponent(uniqueSubDirName, isDirectory: true)
     
-    return await withTaskGroup(of: LocalCopyResponse.self) { group in
-      var results: Array<Dictionary<String, String?>> = [[String: String?]]()
-      
-      for dictionary in from {
-        group.addTask {
-          do {
-            guard let uriString = dictionary["uri"], let uri = URL(string: uriString) else {
-              return LocalCopyResponse.error(sourceUri: dictionary["uri"], copyError: "Invalid URI")
-            }
-            guard let fileName = dictionary["fileName"] else {
-              return LocalCopyResponse.error(sourceUri: uri.absoluteString, copyError: "Invalid fileName")
-            }
-            
-            let destinationUrl = try moveToDestination(from: uri, usingFilename: fileName, destinationDir: destinationDir)
-            return LocalCopyResponse.success(sourceUri: uri.absoluteString, localUri: destinationUrl.absoluteString)
-          } catch {
-            return LocalCopyResponse.error(sourceUri: dictionary["uri"]!, copyError: error.localizedDescription)
-          }
-        }
+    do {
+      try FileManager.default.createDirectory(at: destinationDir, withIntermediateDirectories: true, attributes: nil)
+    } catch {
+      return from.map { dictionary in
+        LocalCopyResponse.error(sourceUri: dictionary["uri"], copyError: "Failed to create destination directory: \(error.localizedDescription)").dictionaryRepresentation
       }
-      
-      for await result in group {
-        results.append(result.dictionaryRepresentation)
-      }
-      
-      return results
+    }
+    
+    // move files
+    return from.map { dictionary in
+      moveSingleFile(dictionary: dictionary, destinationDir: destinationDir).dictionaryRepresentation
+    }
+  }
+  
+  private static func moveSingleFile(dictionary: [String: String], destinationDir: URL) -> LocalCopyResponse {
+    guard let uriString = dictionary["uri"],
+          let uri = URL(string: uriString),
+          let fileName = dictionary["fileName"] else {
+      return LocalCopyResponse.error(
+        sourceUri: dictionary["uri"],
+        copyError: "Invalid URI or fileName"
+      )
+    }
+    
+    do {
+      let destinationUrl = try moveToDestination(from: uri, usingFilename: fileName, destinationDir: destinationDir)
+      return LocalCopyResponse.success(sourceUri: uri.absoluteString, localUri: destinationUrl.absoluteString)
+    } catch {
+      return LocalCopyResponse.error(sourceUri: uriString, copyError: error.localizedDescription)
     }
   }
   
@@ -50,19 +52,20 @@ import Foundation
     let destinationFile = destinationDir.appendingPathComponent(fileName).standardized
     
     guard destinationFile.path.hasPrefix(destinationDir.standardized.path) else {
-      throw NSError(domain: "PathTraversalPrevention", code: 400, userInfo: [NSLocalizedDescriptionKey: "The copied file is attempting to write outside of the target directory."])
+      throw NSError(
+        domain: "PathTraversalPrevention",
+        code: 400,
+        userInfo: [NSLocalizedDescriptionKey: "The copied file is attempting to write outside of the target directory."]
+      )
     }
     
-    try FileManager.default.createDirectory(at: destinationDir, withIntermediateDirectories: true, attributes: nil)
     try FileManager.default.moveItem(at: from, to: destinationFile)
     
     return destinationFile
   }
   
   static func getDirectoryForFileDestination(_ copyToDirectory: String) -> URL {
-    if copyToDirectory == "documentDirectory" {
-      return FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
-    }
-    return FileManager.default.urls(for: .cachesDirectory, in: .userDomainMask).first!
+    let searchPath: FileManager.SearchPathDirectory = copyToDirectory == "documentDirectory" ? .documentDirectory : .cachesDirectory
+    return FileManager.default.urls(for: searchPath, in: .userDomainMask).first!
   }
 }

package/ios/swift/IsKnownTypeImpl.swift

@@ -28,14 +28,10 @@ import UniformTypeIdentifiers
 
   static func createUTType(kind: String, value: String) -> UTType? {
     switch kind {
-    case "UTType":
-      return UTType(value)
-    case "mimeType":
-      return UTType(mimeType: value)
-    case "extension":
-      return UTType(filenameExtension: value)
-    default:
-      return nil
+    case "UTType": UTType(value)
+    case "mimeType": UTType(mimeType: value)
+    case "extension": UTType(filenameExtension: value)
+    default: nil
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-documents/picker",
-  "version": "10.1.3",
+  "version": "10.1.5",
   "description": "A react native interface to access documents from dropbox, google drive, iCloud...",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",