@react-native-documents/picker 10.1.1 → 10.1.3

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

@@ -254,12 +254,12 @@ class RNDocumentPickerModule(reactContext: ReactApplicationContext) :
         reactApplicationContext.contentResolver.takePersistableUriPermission(uri, takeFlags)
         val encodedBookmark =
             Base64.encodeToString(uri.toString().toByteArray(Charsets.UTF_8), Base64.DEFAULT)
-        map.putString("status", "success")
+        map.putString("bookmarkStatus", "success")
         map.putString("bookmark", encodedBookmark)
       } catch (e: Exception) {
         val error =
             e.localizedMessage ?: e.message ?: "Unknown error with takePersistableUriPermission"
-        map.putString("status", "error")
+        map.putString("bookmarkStatus", "error")
         map.putString("bookmarkError", error)
       }
     }
@@ -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/package.json

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