@react-native-documents/picker 10.1.0 → 10.1.2

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

@@ -65,7 +65,8 @@ class MetadataGetter(private val uriMap: MutableMap<String, Uri>) {
           }
         }
 
-        queryContentResolverMetadata(contentResolver, metadataBuilder, context)
+        val couldBeVirtualFile = pickOptions.allowVirtualFiles && DocumentsContract.isDocumentUri(context, sourceUri)
+        queryContentResolverMetadata(contentResolver, metadataBuilder, couldBeVirtualFile)
 
         metadataBuilder
       }
@@ -73,18 +74,24 @@ class MetadataGetter(private val uriMap: MutableMap<String, Uri>) {
   fun queryContentResolverMetadata(
       contentResolver: ContentResolver,
       metadataBuilder: DocumentMetadataBuilder,
-      context: Context
+      couldBeVirtualFile: Boolean
   ) {
     val forUri = metadataBuilder.getUri()
+
+    val projection = mutableListOf(
+      DocumentsContract.Document.COLUMN_MIME_TYPE,
+      OpenableColumns.DISPLAY_NAME,
+      OpenableColumns.SIZE,
+    ).apply {
+      if (couldBeVirtualFile) {
+        add(DocumentsContract.Document.COLUMN_FLAGS)
+      }
+    }.toTypedArray()
+
     contentResolver
       .query(
         forUri,
-        arrayOf(
-          DocumentsContract.Document.COLUMN_MIME_TYPE,
-          OpenableColumns.DISPLAY_NAME,
-          OpenableColumns.SIZE,
-          DocumentsContract.Document.COLUMN_FLAGS,
-        ),
+        projection,
         null,
         null,
         null
@@ -106,7 +113,7 @@ class MetadataGetter(private val uriMap: MutableMap<String, Uri>) {
           if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             // https://developer.android.com/training/data-storage/shared/documents-files#open-virtual-file
             val isVirtual =
-              if (DocumentsContract.isDocumentUri(context, forUri)) {
+              if (couldBeVirtualFile) {
                 val cursorValue: Int =
                   getCursorValue(
                     cursor, DocumentsContract.Document.COLUMN_FLAGS, Int::class.java

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

@@ -272,7 +272,7 @@ class RNDocumentPickerModule(reactContext: ReactApplicationContext) :
         val targetUriString = if (options.hasKey("uri")) options.getString("uri") else null
 
         val metadataBuilder = fileOps.writeDocumentImpl(currentUriOfFileBeingExported, targetUriString, reactApplicationContext)
-        metadataGetter.queryContentResolverMetadata(reactApplicationContext.contentResolver, metadataBuilder, reactApplicationContext)
+        metadataGetter.queryContentResolverMetadata(reactApplicationContext.contentResolver, metadataBuilder, couldBeVirtualFile = false)
 
         val arrayWithSingleResult = Arguments.createArray().apply {
           val resultMap = metadataBuilder.build()

package/ios/RNDocumentPicker.mm

@@ -6,7 +6,14 @@
 #import "RCTConvert+RNDocumentPicker.h"
 // this header file is generated by Xcode: https://developer.apple.com/documentation/swift/importing-swift-into-objective-c
 // if it cannot be found, try cleaning the build folder and Xcode derived data folder
+
+// When using use_frameworks! :linkage => :static in Podfile
+#if __has_include(<react_native_document_picker/react_native_document_picker-Swift.h>)
+#import <react_native_document_picker/react_native_document_picker-Swift.h>
+#else
 #import "react_native_document_picker-Swift.h"
+#endif
+
 // for UIModalPresentationStyle conversion
 // remove after https://github.com/facebook/react-native/commit/2d547a3252b328251e49dabfeec85f8d46c85411 is released
 #import <React/RCTModalHostViewManager.h>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-documents/picker",
-  "version": "10.1.0",
+  "version": "10.1.2",
   "description": "A react native interface to access documents from dropbox, google drive, iCloud...",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
@@ -50,7 +50,7 @@
     "url": "git+https://github.com/react-native-documents/document-picker.git"
   },
   "author": "Vojtech Novak (hello@react-native-training.eu)",
-  "license": "see LICENSE file",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/react-native-documents/document-picker/issues"
   },

package/react-native-document-picker.podspec

@@ -21,10 +21,5 @@ Pod::Spec.new do |s|
     'DEFINES_MODULE' => 'YES',
   }
 
-  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
-    # RN 71+
-    install_modules_dependencies(s)
-  else
-    s.dependency "React-Core"
-  end
+  install_modules_dependencies(s)
 end