expo-media-library 18.3.0-canary-20251015-a6a1272 → 18.3.0-canary-20251031-b135dff

package/CHANGELOG.md

@@ -11,6 +11,7 @@
 
 ### 🐛 Bug fixes
 
+- Fix `endCursor` description in the documentation. ([#39120](https://github.com/expo/expo/pull/39120) by [@Wenszel](https://github.com/Wenszel))
 - [next][iOS] Convert `id` to URI format ([#39920](https://github.com/expo/expo/pull/39920) by [@Wenszel](https://github.com/Wenszel))
 - [next][android] Fix `delete()` throwing security exception ([#39914](https://github.com/expo/expo/pull/39914) by [@Wenszel](https://github.com/Wenszel))
 - [next][android] Change default root directory to Pictures ([#39716](https://github.com/expo/expo/pull/39716) by [@Wenszel](https://github.com/Wenszel))
@@ -18,8 +19,10 @@
 
 ### 💡 Others
 
+- [next][android] Refactor permissions ([#40076](https://github.com/expo/expo/pull/40076) by [@Wenszel](https://github.com/Wenszel))
 - [next] Add test screens ([#39951](https://github.com/expo/expo/pull/39951) by [@Wenszel](https://github.com/Wenszel))
 - [next] Add documentation ([#39754](https://github.com/expo/expo/pull/39754) by [@Wenszel](https://github.com/Wenszel))
+- Remove tests related files from the published package content. ([#39551](https://github.com/expo/expo/pull/39551) by [@Simek](https://github.com/Simek))
 
 ## 18.2.0 — 2025-09-16
 

package/android/build.gradle

@@ -4,13 +4,13 @@ plugins {
 }
 
 group = 'host.exp.exponent'
-version = '18.3.0-canary-20251015-a6a1272'
+version = '18.3.0-canary-20251031-b135dff'
 
 android {
   namespace "expo.modules.medialibrary"
   defaultConfig {
     versionCode 37
-    versionName "18.3.0-canary-20251015-a6a1272"
+    versionName "18.3.0-canary-20251031-b135dff"
   }
 }
 

package/android/src/main/java/expo/modules/medialibrary/next/MediaLibraryNextModule.kt

@@ -47,7 +47,7 @@ class MediaLibraryNextModule : Module() {
 
   private val albumFactory by lazy {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-      AlbumModernFactory(assetFactory, assetDeleter, context)
+      AlbumModernFactory(assetFactory, assetDeleter, mediaStorePermissionsDelegate, context)
     } else {
       AlbumLegacyFactory(assetFactory, assetDeleter, context)
     }
@@ -55,9 +55,9 @@ class MediaLibraryNextModule : Module() {
 
   private val assetFactory by lazy {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-      AssetModernFactory(assetDeleter, context)
+      AssetModernFactory(assetDeleter, mediaStorePermissionsDelegate, context)
     } else {
-      AssetLegacyFactory(assetDeleter, context)
+      AssetLegacyFactory(assetDeleter, systemPermissionsDelegate, context)
     }
   }
 
@@ -65,7 +65,7 @@ class MediaLibraryNextModule : Module() {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
       AssetModernDeleter(mediaStorePermissionsDelegate)
     } else {
-      AssetLegacyDeleter(context)
+      AssetLegacyDeleter(systemPermissionsDelegate, context)
     }
   }
 
@@ -78,62 +78,50 @@ class MediaLibraryNextModule : Module() {
       }
 
       Property("id") { self: Asset ->
-        systemPermissionsDelegate.requireSystemPermissions(false)
         self.contentUri
       }
 
       AsyncFunction("getCreationTime") Coroutine { self: Asset ->
-        systemPermissionsDelegate.requireSystemPermissions(false)
         self.getCreationTime()
       }
 
       AsyncFunction("getDuration") Coroutine { self: Asset ->
-        systemPermissionsDelegate.requireSystemPermissions(false)
         self.getDuration()
       }
 
       AsyncFunction("getExif") Coroutine { self: Asset ->
-        systemPermissionsDelegate.requireSystemPermissions(false)
         self.getExif()
       }
 
       AsyncFunction("getLocation") Coroutine { self: Asset ->
-        systemPermissionsDelegate.requireSystemPermissions(false)
         self.getLocation()
       }
 
       AsyncFunction("getFilename") Coroutine { self: Asset ->
-        systemPermissionsDelegate.requireSystemPermissions(false)
         self.getFilename()
       }
 
       AsyncFunction("getHeight") Coroutine { self: Asset ->
-        systemPermissionsDelegate.requireSystemPermissions(false)
         self.getHeight()
       }
 
       AsyncFunction("getMediaType") Coroutine { self: Asset ->
-        systemPermissionsDelegate.requireSystemPermissions(false)
         self.getMediaType()
       }
 
       AsyncFunction("getModificationTime") Coroutine { self: Asset ->
-        systemPermissionsDelegate.requireSystemPermissions(false)
         self.getModificationTime()
       }
 
       AsyncFunction("getUri") Coroutine { self: Asset ->
-        systemPermissionsDelegate.requireSystemPermissions(false)
         self.getUri()
       }
 
       AsyncFunction("getWidth") Coroutine { self: Asset ->
-        systemPermissionsDelegate.requireSystemPermissions(false)
         self.getWidth()
       }
 
       AsyncFunction("delete") Coroutine { self: Asset ->
-        systemPermissionsDelegate.requireSystemPermissions(true)
         self.delete()
       }
     }
@@ -148,23 +136,18 @@ class MediaLibraryNextModule : Module() {
       }
 
       AsyncFunction("getTitle") Coroutine { self: Album ->
-        systemPermissionsDelegate.requireSystemPermissions(false)
         self.getTitle()
       }
 
       AsyncFunction("getAssets") Coroutine { self: Album ->
-        systemPermissionsDelegate.requireSystemPermissions(false)
         self.getAssets()
       }
 
       AsyncFunction("add") Coroutine { self: Album, asset: Asset ->
-        systemPermissionsDelegate.requireSystemPermissions(true)
-        mediaStorePermissionsDelegate.requestMediaLibraryWritePermission(listOf(asset.contentUri))
         self.add(asset)
       }
 
       AsyncFunction("delete") Coroutine { self: Album ->
-        systemPermissionsDelegate.requireSystemPermissions(true)
         self.delete()
       }
     }
@@ -227,13 +210,11 @@ class MediaLibraryNextModule : Module() {
     }
 
     AsyncFunction("createAsset") Coroutine { filePath: Uri, album: Album? ->
-      systemPermissionsDelegate.requireSystemPermissions(true)
       return@Coroutine assetFactory.create(filePath, album?.getRelativePath())
     }
 
     @OptIn(EitherType::class)
     AsyncFunction("createAlbum") Coroutine { name: String, assetRefs: Either<List<Asset>, List<Uri>>, move: Boolean ->
-      systemPermissionsDelegate.requireSystemPermissions(true)
       val assetListKClass = toKClass<List<Asset>>()
       if (assetRefs.`is`(assetListKClass)) {
         val assetList = assetRefs.get(assetListKClass)
@@ -244,12 +225,10 @@ class MediaLibraryNextModule : Module() {
     }
 
     AsyncFunction("getAlbum") Coroutine { title: String ->
-      systemPermissionsDelegate.requireSystemPermissions(false)
       albumQuery.getAlbum(title)
     }
 
     AsyncFunction("deleteAlbums") Coroutine { albums: List<Album> ->
-      systemPermissionsDelegate.requireSystemPermissions(true)
       val contentUris = albums
         .map { it.getAssets() }
         .flatten()
@@ -258,7 +237,6 @@ class MediaLibraryNextModule : Module() {
     }
 
     AsyncFunction("deleteAssets") Coroutine { assets: List<Asset> ->
-      systemPermissionsDelegate.requireSystemPermissions(true)
       assetDeleter.delete(assets.map { it.contentUri })
     }
 

package/android/src/main/java/expo/modules/medialibrary/next/exceptions/PermissionExceptions.kt

@@ -2,5 +2,4 @@ package expo.modules.medialibrary.next.exceptions
 
 import expo.modules.kotlin.exception.CodedException
 
-class PermissionException(message: String) :
-  CodedException(message)
+class PermissionException(message: String, cause: Throwable? = null) : CodedException(message, cause)

package/android/src/main/java/expo/modules/medialibrary/next/extensions/ContextExtensions.kt

@@ -0,0 +1,16 @@
+package expo.modules.medialibrary.next.extensions
+
+import android.content.Context
+import android.media.MediaScannerConnection
+import android.net.Uri
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
+
+suspend fun Context.scanFile(
+  path: String,
+  mimeType: String? = null
+): Pair<String, Uri?> = suspendCoroutine { continuation ->
+  MediaScannerConnection.scanFile(this, arrayOf(path), arrayOf(mimeType)) { path, uri ->
+    continuation.resume(Pair(path, uri))
+  }
+}

package/android/src/main/java/expo/modules/medialibrary/next/extensions/resolver/QueryOne.kt

@@ -16,7 +16,7 @@ suspend fun <T> ContentResolver.queryOne(
   sortOrder: String? = null
 ): T? = withContext(Dispatchers.IO) {
   val projection = arrayOf(column)
-  query(contentUri, projection, selection, selectionArgs, sortOrder)?.use { cursor ->
+  safeQuery(contentUri, projection, selection, selectionArgs, sortOrder)?.use { cursor ->
     ensureActive()
     val index = cursor.getColumnIndexOrThrow(column)
     return@withContext if (cursor.moveToFirst()) {
@@ -25,5 +25,4 @@ suspend fun <T> ContentResolver.queryOne(
       null
     }
   }
-  return@withContext null
 }

package/android/src/main/java/expo/modules/medialibrary/next/extensions/resolver/SafeQuery.kt

@@ -0,0 +1,20 @@
+package expo.modules.medialibrary.next.extensions.resolver
+
+import android.content.ContentResolver
+import android.database.Cursor
+import android.net.Uri
+import expo.modules.medialibrary.next.exceptions.PermissionException
+
+fun ContentResolver.safeQuery(
+  uri: Uri,
+  projection: Array<String>,
+  selection: String? = null,
+  selectionArgs: Array<String>? = null,
+  sortOrder: String? = null
+): Cursor? {
+  return try {
+    query(uri, projection, selection, selectionArgs, sortOrder)
+  } catch (e: SecurityException) {
+    throw PermissionException("Missing required system permissions", e)
+  }
+}

package/android/src/main/java/expo/modules/medialibrary/next/objects/album/factories/AlbumModernFactory.kt

@@ -14,6 +14,7 @@ import expo.modules.medialibrary.next.objects.asset.Asset
 import expo.modules.medialibrary.next.objects.asset.deleters.AssetDeleter
 import expo.modules.medialibrary.next.objects.wrappers.MimeType
 import expo.modules.medialibrary.next.objects.asset.factories.AssetFactory
+import expo.modules.medialibrary.next.permissions.MediaStorePermissionsDelegate
 import java.io.IOException
 import java.lang.ref.WeakReference
 
@@ -21,6 +22,7 @@ import java.lang.ref.WeakReference
 class AlbumModernFactory(
   private val assetFactory: AssetFactory,
   private val assetDeleter: AssetDeleter,
+  private val mediaStorePermissionsDelegate: MediaStorePermissionsDelegate,
   context: Context
 ) : AlbumFactory {
   private val contextRef = WeakReference(context)
@@ -61,6 +63,7 @@ class AlbumModernFactory(
 
   private suspend fun processAssetsLocation(assets: List<Asset>, relativePath: RelativePath, deleteOriginalAssets: Boolean) {
     if (deleteOriginalAssets) {
+      mediaStorePermissionsDelegate.requestMediaLibraryWritePermission(assets.map { it.contentUri })
       assets.map { it.move(relativePath) }
     } else {
       assets.map { it.copy(relativePath) }

package/android/src/main/java/expo/modules/medialibrary/next/objects/asset/delegates/AssetLegacyDelegate.kt

@@ -8,7 +8,6 @@ import android.os.Bundle
 import androidx.annotation.DeprecatedSinceApi
 import androidx.core.net.toUri
 import androidx.exifinterface.media.ExifInterface
-import expo.modules.medialibrary.MediaLibraryUtils
 import expo.modules.medialibrary.next.exceptions.AssetCouldNotBeCreated
 import expo.modules.medialibrary.next.exceptions.AssetPropertyNotFoundException
 import expo.modules.medialibrary.next.exceptions.ContentResolverNotObtainedException
@@ -23,12 +22,14 @@ import expo.modules.medialibrary.next.extensions.resolver.queryAssetWidth
 import expo.modules.medialibrary.next.extensions.resolver.queryAssetCreationTime
 import expo.modules.medialibrary.next.extensions.safeCopy
 import expo.modules.medialibrary.next.extensions.safeMove
+import expo.modules.medialibrary.next.extensions.scanFile
 import expo.modules.medialibrary.next.objects.wrappers.RelativePath
 import expo.modules.medialibrary.next.objects.asset.Asset
 import expo.modules.medialibrary.next.objects.asset.EXIF_TAGS
 import expo.modules.medialibrary.next.objects.asset.deleters.AssetDeleter
 import expo.modules.medialibrary.next.objects.wrappers.MediaType
 import expo.modules.medialibrary.next.objects.wrappers.MimeType
+import expo.modules.medialibrary.next.permissions.SystemPermissionsDelegate
 import expo.modules.medialibrary.next.records.Location
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ensureActive
@@ -44,6 +45,7 @@ import kotlin.time.toDuration
 class AssetLegacyDelegate(
   contentUri: Uri,
   val assetDeleter: AssetDeleter,
+  val systemPermissionsDelegate: SystemPermissionsDelegate,
   context: Context
 ) : AssetDelegate {
   private val contextRef = WeakReference(context)
@@ -121,14 +123,17 @@ class AssetLegacyDelegate(
       ?: MimeType.from(getUri())
   }
 
-  override suspend fun getLocation(): Location? =
-    contentResolver.openInputStream(contentUri)?.use { stream ->
+  override suspend fun getLocation(): Location? {
+    systemPermissionsDelegate.requireReadPermissions()
+    return contentResolver.openInputStream(contentUri)?.use { stream ->
       ExifInterface(stream)
         .latLong
         ?.let { (lat, long) -> Location(lat, long) }
     }
+  }
 
   override suspend fun getExif(): Bundle = withContext(Dispatchers.IO) {
+    systemPermissionsDelegate.requireReadPermissions()
     if (getMediaType() != MediaType.IMAGE) {
       return@withContext Bundle()
     }
@@ -163,11 +168,12 @@ class AssetLegacyDelegate(
   }
 
   override suspend fun move(relativePath: RelativePath) = withContext(Dispatchers.IO) {
+    systemPermissionsDelegate.requireWritePermissions()
     val path = contentResolver.queryAssetPath(contentUri)
       ?: throw AssetPropertyNotFoundException("Asset path")
     val newFile = File(path).safeMove(File(relativePath.toFilePath()))
     contentResolver.deleteBy(path)
-    val (_, uri) = MediaLibraryUtils.scanFile(contextRef.getOrThrow(), arrayOf(newFile.path), null)
+    val (_, uri) = contextRef.getOrThrow().scanFile(newFile.path, null)
     this@AssetLegacyDelegate.contentUri = uri
       ?: throw AssetCouldNotBeCreated("Could not create a new asset while moving the old one")
   }
@@ -176,11 +182,11 @@ class AssetLegacyDelegate(
     val path = contentResolver.queryAssetPath(contentUri)
       ?: throw AssetPropertyNotFoundException("Asset path")
     val newFile = File(path).safeCopy(File(relativePath.toFilePath()))
-    val (_, uri) = MediaLibraryUtils.scanFile(contextRef.getOrThrow(), arrayOf(newFile.path), null)
+    val (_, uri) = contextRef.getOrThrow().scanFile(newFile.path, null)
     if (uri == null) {
       throw AssetCouldNotBeCreated("Could not create a new asset while copying the old one")
     }
-    val newAssetDelegate = AssetLegacyDelegate(contentUri, assetDeleter, contextRef.getOrThrow())
+    val newAssetDelegate = AssetLegacyDelegate(contentUri, assetDeleter, systemPermissionsDelegate, contextRef.getOrThrow())
     return@withContext Asset(newAssetDelegate)
   }
 }

package/android/src/main/java/expo/modules/medialibrary/next/objects/asset/delegates/AssetModernDelegate.kt

@@ -28,6 +28,7 @@ import expo.modules.medialibrary.next.objects.asset.EXIF_TAGS
 import expo.modules.medialibrary.next.objects.asset.deleters.AssetDeleter
 import expo.modules.medialibrary.next.objects.wrappers.MediaType
 import expo.modules.medialibrary.next.objects.wrappers.MimeType
+import expo.modules.medialibrary.next.permissions.MediaStorePermissionsDelegate
 import expo.modules.medialibrary.next.records.Location
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ensureActive
@@ -44,6 +45,7 @@ import kotlin.time.toDuration
 class AssetModernDelegate(
   override val contentUri: Uri,
   val assetDeleter: AssetDeleter,
+  val mediaStorePermissionsDelegate: MediaStorePermissionsDelegate,
   context: Context
 ) : AssetDelegate {
   private val contextRef = WeakReference(context)
@@ -75,21 +77,19 @@ class AssetModernDelegate(
 
   override suspend fun getHeight(): Int {
     val height = contentResolver.queryAssetHeight(contentUri)
-      ?: throw AssetPropertyNotFoundException("Height")
     // If height is not saved to the database
-    if (getMediaType() == MediaType.IMAGE && height <= 0) {
+    if (getMediaType() == MediaType.IMAGE && height != null && height <= 0) {
       return downloadBitmapAndGet { it.outHeight }
     }
-    return height
+    return height ?: throw AssetPropertyNotFoundException("Height")
   }
 
   override suspend fun getWidth(): Int {
     val width = contentResolver.queryAssetWidth(contentUri)
-      ?: throw AssetPropertyNotFoundException("Width")
-    if (getMediaType() == MediaType.IMAGE && width <= 0) {
+    if (getMediaType() == MediaType.IMAGE && width != null && width <= 0) {
       return downloadBitmapAndGet { it.outWidth }
     }
-    return width
+    return width ?: throw AssetPropertyNotFoundException("Width")
   }
 
   private suspend fun downloadBitmapAndGet(extract: (BitmapFactory.Options) -> Int): Int {
@@ -155,6 +155,7 @@ class AssetModernDelegate(
   }
 
   override suspend fun move(relativePath: RelativePath) {
+    mediaStorePermissionsDelegate.requestMediaLibraryWritePermission(listOf(contentUri))
     contentResolver.updateRelativePath(contentUri, relativePath)
   }
 
@@ -162,7 +163,7 @@ class AssetModernDelegate(
     val newAssetUri = contentResolver.insertPendingAsset(getFilename(), getMimeType(), relativePath)
     contentResolver.copyUriContent(contentUri, newAssetUri)
     contentResolver.publishPendingAsset(newAssetUri)
-    val newAssetDelegate = AssetModernDelegate(newAssetUri, assetDeleter, contextRef.getOrThrow())
+    val newAssetDelegate = AssetModernDelegate(newAssetUri, assetDeleter, mediaStorePermissionsDelegate, contextRef.getOrThrow())
     return@withContext Asset(newAssetDelegate)
   }
 }

package/android/src/main/java/expo/modules/medialibrary/next/objects/asset/deleters/AssetLegacyDeleter.kt

@@ -9,6 +9,7 @@ import expo.modules.medialibrary.next.exceptions.AssetPropertyNotFoundException
 import expo.modules.medialibrary.next.exceptions.ContentResolverNotObtainedException
 import expo.modules.medialibrary.next.extensions.getOrThrow
 import expo.modules.medialibrary.next.extensions.resolver.queryAssetPath
+import expo.modules.medialibrary.next.permissions.SystemPermissionsDelegate
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -16,8 +17,11 @@ import kotlinx.coroutines.withContext
 import java.io.File
 import java.lang.ref.WeakReference
 
-@DeprecatedSinceApi(Build.VERSION_CODES.Q)
-class AssetLegacyDeleter(context: Context) : AssetDeleter {
+@DeprecatedSinceApi(Build.VERSION_CODES.R)
+class AssetLegacyDeleter(
+  val systemPermissionsDelegate: SystemPermissionsDelegate,
+  context: Context
+) : AssetDeleter {
   private val contextRef = WeakReference(context)
 
   private val contentResolver
@@ -26,6 +30,7 @@ class AssetLegacyDeleter(context: Context) : AssetDeleter {
       .contentResolver ?: throw ContentResolverNotObtainedException()
 
   override suspend fun delete(contentUri: Uri): Unit = withContext(Dispatchers.IO) {
+    systemPermissionsDelegate.requireWritePermissions()
     val path = contentResolver.queryAssetPath(contentUri)
       ?: throw AssetPropertyNotFoundException("Uri")
     if (!File(path).delete()) {

package/android/src/main/java/expo/modules/medialibrary/next/objects/asset/factories/AssetLegacyFactory.kt

@@ -1,11 +1,11 @@
 package expo.modules.medialibrary.next.objects.asset.factories
 
 import android.content.Context
+import android.media.MediaScannerConnection
 import android.net.Uri
 import android.os.Build
 import androidx.annotation.DeprecatedSinceApi
 import androidx.core.net.toFile
-import expo.modules.medialibrary.MediaLibraryUtils
 import expo.modules.medialibrary.next.exceptions.AssetCouldNotBeCreated
 import expo.modules.medialibrary.next.exceptions.ContentResolverNotObtainedException
 import expo.modules.medialibrary.next.extensions.getOrThrow
@@ -16,15 +16,19 @@ import expo.modules.medialibrary.next.objects.asset.delegates.AssetDelegate
 import expo.modules.medialibrary.next.objects.asset.delegates.AssetLegacyDelegate
 import expo.modules.medialibrary.next.objects.asset.deleters.AssetDeleter
 import expo.modules.medialibrary.next.objects.wrappers.MimeType
+import expo.modules.medialibrary.next.permissions.SystemPermissionsDelegate
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.withContext
 import java.io.File
 import java.lang.ref.WeakReference
+import kotlin.coroutines.resume
+import kotlin.coroutines.suspendCoroutine
 
 @DeprecatedSinceApi(Build.VERSION_CODES.R)
 class AssetLegacyFactory(
   val assetDeleter: AssetDeleter,
+  val systemPermissionsDelegate: SystemPermissionsDelegate,
   context: Context
 ) : AssetFactory {
   private val contextRef = WeakReference(context)
@@ -35,7 +39,7 @@ class AssetLegacyFactory(
       .contentResolver ?: throw ContentResolverNotObtainedException()
 
   private fun createAssetDelegate(contentUri: Uri): AssetDelegate {
-    return AssetLegacyDelegate(contentUri, assetDeleter, contextRef.getOrThrow())
+    return AssetLegacyDelegate(contentUri, assetDeleter, systemPermissionsDelegate, contextRef.getOrThrow())
   }
 
   override fun create(contentUri: Uri): Asset {
@@ -44,24 +48,35 @@ class AssetLegacyFactory(
   }
 
   override suspend fun create(filePath: Uri, relativePath: RelativePath?): Asset = withContext(Dispatchers.IO) {
-    val mimeType = contentResolver.getType(filePath)?.let { MimeType(it) }
-      ?: MimeType.from(filePath)
+    systemPermissionsDelegate.requireWritePermissions()
+    val destinationDirectory = createDestinationDirectory(filePath, relativePath)
+    val destinationFile = filePath
+      .toFile()
+      .safeCopy(destinationDirectory)
+    val (_, uri) = scanFile(contextRef.getOrThrow(), arrayOf(destinationFile.toString()), null)
+    ensureActive()
+    if (uri == null) {
+      throw AssetCouldNotBeCreated("Failed to create asset: could not add asset to MediaStore")
+    }
+    return@withContext create(uri)
+  }
+
+  private fun createDestinationDirectory(filePath: Uri, relativePath: RelativePath?): File {
     val destinationDirectory = if (relativePath != null) {
       File(relativePath.toFilePath())
     } else {
+      val mimeType = contentResolver.getType(filePath)?.let { MimeType(it) }
+        ?: MimeType.from(filePath)
       mimeType.externalStorageAssetDirectory()
     }
     destinationDirectory.mkdirs()
+    return destinationDirectory
+  }
 
-    val destFile = filePath
-      .toFile()
-      .safeCopy(destinationDirectory)
-    val (_, uri) = MediaLibraryUtils.scanFile(contextRef.getOrThrow(), arrayOf(destFile.toString()), null)
-    coroutineContext.ensureActive()
-
-    if (uri == null) {
-      throw AssetCouldNotBeCreated("Failed to create asset: could not add asset to MediaStore")
+  private suspend fun scanFile(context: Context, paths: Array<String>, mimeTypes: Array<String>?) =
+    suspendCoroutine { complete ->
+      MediaScannerConnection.scanFile(context, paths, mimeTypes) { path: String, uri: Uri? ->
+        complete.resume(Pair(path, uri))
+      }
     }
-    return@withContext create(uri)
-  }
 }

package/android/src/main/java/expo/modules/medialibrary/next/objects/asset/factories/AssetModernFactory.kt

@@ -15,6 +15,7 @@ import expo.modules.medialibrary.next.objects.asset.delegates.AssetDelegate
 import expo.modules.medialibrary.next.objects.asset.delegates.AssetModernDelegate
 import expo.modules.medialibrary.next.objects.asset.deleters.AssetDeleter
 import expo.modules.medialibrary.next.objects.wrappers.MimeType
+import expo.modules.medialibrary.next.permissions.MediaStorePermissionsDelegate
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.withContext
@@ -23,6 +24,7 @@ import java.lang.ref.WeakReference
 @RequiresApi(Build.VERSION_CODES.R)
 class AssetModernFactory(
   val assetDeleter: AssetDeleter,
+  val mediaStorePermissionsDelegate: MediaStorePermissionsDelegate,
   context: Context
 ) : AssetFactory {
   private val contextRef = WeakReference(context)
@@ -36,6 +38,7 @@ class AssetModernFactory(
     return AssetModernDelegate(
       contentUri,
       assetDeleter,
+      mediaStorePermissionsDelegate,
       contextRef.getOrThrow()
     )
   }

package/android/src/main/java/expo/modules/medialibrary/next/objects/query/builder/QueryLegacyExecutor.kt

@@ -7,6 +7,7 @@ import android.provider.MediaStore
 import androidx.annotation.DeprecatedSinceApi
 import expo.modules.medialibrary.next.exceptions.QueryCouldNotBeExecuted
 import expo.modules.medialibrary.next.extensions.resolver.EXTERNAL_CONTENT_URI
+import expo.modules.medialibrary.next.extensions.resolver.safeQuery
 import expo.modules.medialibrary.next.records.SortDescriptor
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -26,7 +27,7 @@ class QueryLegacyExecutor(
     val selection = buildSelection()
     val sortOrder = buildSortOrder()
     val selectionArgs = args.toTypedArray()
-    return@withContext contentResolver.query(EXTERNAL_CONTENT_URI, projection, selection, selectionArgs, sortOrder)
+    return@withContext contentResolver.safeQuery(EXTERNAL_CONTENT_URI, projection, selection, selectionArgs, sortOrder)
       ?: throw QueryCouldNotBeExecuted("Cursor is null")
   }
 

package/android/src/main/java/expo/modules/medialibrary/next/permissions/MediaStorePermissionsDelegate.kt

@@ -1,10 +1,7 @@
 package expo.modules.medialibrary.next.permissions
 
 import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
 import android.net.Uri
-import android.os.Binder
 import android.os.Build
 import androidx.annotation.RequiresApi
 import expo.modules.kotlin.AppContext
@@ -56,12 +53,9 @@ class MediaStorePermissionsDelegate(val appContext: AppContext) {
     writeLauncher = registerForActivityResult(WriteContract(appContextProvider))
   }
 
-  private fun hasWritePermissionForUri(uri: Uri): Boolean {
-    return context.checkUriPermission(
-      uri,
-      Binder.getCallingPid(),
-      Binder.getCallingUid(),
-      Intent.FLAG_GRANT_WRITE_URI_PERMISSION
-    ) == PackageManager.PERMISSION_GRANTED
-  }
+  private fun hasWritePermissionForUri(uri: Uri): Boolean =
+    runCatching {
+      context.contentResolver.openOutputStream(uri, "rw")?.close()
+      return true
+    }.getOrDefault(false)
 }