expo-media-library 18.1.2-canary-20250912-b5ce2a8 → 18.3.0-canary-20250919-7a31b96

package/CHANGELOG.md

@@ -6,10 +6,23 @@
 
 ### 🎉 New features
 
+- [next] Add `Album.get(title)` ([#39717](https://github.com/expo/expo/pull/39717) by [@Wenszel](https://github.com/Wenszel))
+
 ### 🐛 Bug fixes
 
+- [next][android] Change default root directory to Pictures ([#39716](https://github.com/expo/expo/pull/39716) by [@Wenszel](https://github.com/Wenszel))
+- [next] Fix `asset.getModificationTime` to return milliseconds ([#39715](https://github.com/expo/expo/pull/39715) by [@Wenszel](https://github.com/Wenszel))
+
 ### 💡 Others
 
+- [next] Add documentation ([#39754](https://github.com/expo/expo/pull/39754) by [@Wenszel](https://github.com/Wenszel))
+
+## 18.2.0 — 2025-09-16
+
+### 🎉 New features
+
+- [next] Add Query ([#39559](https://github.com/expo/expo/pull/39559) by [@Wenszel](https://github.com/Wenszel))
+
 ## 18.1.1 — 2025-09-10
 
 ### 💡 Others

package/android/build.gradle

@@ -4,13 +4,13 @@ plugins {
 }
 
 group = 'host.exp.exponent'
-version = '18.1.2-canary-20250912-b5ce2a8'
+version = '18.3.0-canary-20250919-7a31b96'
 
 android {
   namespace "expo.modules.medialibrary"
   defaultConfig {
     versionCode 37
-    versionName "18.1.2-canary-20250912-b5ce2a8"
+    versionName "18.3.0-canary-20250919-7a31b96"
   }
 }
 

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

@@ -11,15 +11,22 @@ import expo.modules.kotlin.modules.ModuleDefinition
 import expo.modules.kotlin.types.Either
 import expo.modules.kotlin.types.toKClass
 import expo.modules.medialibrary.next.objects.album.Album
+import expo.modules.medialibrary.next.objects.album.AlbumQuery
 import expo.modules.medialibrary.next.objects.asset.Asset
 import expo.modules.medialibrary.next.objects.album.factories.AlbumModernFactory
 import expo.modules.medialibrary.next.objects.album.factories.AlbumLegacyFactory
 import expo.modules.medialibrary.next.objects.asset.factories.AssetModernFactory
 import expo.modules.medialibrary.next.objects.asset.factories.AssetLegacyFactory
+import expo.modules.medialibrary.next.objects.query.MediaStoreQueryFormatter
+import expo.modules.medialibrary.next.objects.query.Query
+import expo.modules.medialibrary.next.objects.wrappers.MediaType
 import expo.modules.medialibrary.next.permissions.MediaStorePermissionsDelegate
 import expo.modules.medialibrary.next.permissions.SystemPermissionsDelegate
 import expo.modules.medialibrary.next.permissions.enums.GranularPermission
+import expo.modules.medialibrary.next.records.AssetField
+import expo.modules.medialibrary.next.records.SortDescriptor
 
+@OptIn(EitherType::class)
 class MediaLibraryNextModule : Module() {
   private val context
     get() = appContext.reactContext ?: throw Exceptions.ReactContextLost()
@@ -32,6 +39,10 @@ class MediaLibraryNextModule : Module() {
     MediaStorePermissionsDelegate(appContext)
   }
 
+  private val albumQuery by lazy {
+    AlbumQuery(context)
+  }
+
   private val albumFactory by lazy {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
       AlbumModernFactory(assetFactory, context)
@@ -141,6 +152,63 @@ class MediaLibraryNextModule : Module() {
       }
     }
 
+    Class(Query::class) {
+      Constructor {
+        Query(context)
+      }
+
+      Function("limit") { self: Query, limit: Int ->
+        self.limit(limit)
+      }
+
+      Function("offset") { self: Query, offset: Int ->
+        self.offset(offset)
+      }
+
+      Function("album") { self: Query, album: Album ->
+        self.album(album)
+      }
+
+      Function("eq") { self: Query, field: AssetField, value: Either<MediaType, Long> ->
+        self.eq(field, MediaStoreQueryFormatter.parse(field, value))
+      }
+
+      Function("within") { self: Query, field: AssetField, values: List<Either<MediaType, Long>> ->
+        val stringValues = values.map { value -> MediaStoreQueryFormatter.parse(field, value) }
+        self.within(field, stringValues)
+      }
+
+      Function("gt") { self: Query, field: AssetField, value: Long ->
+        self.gt(field, MediaStoreQueryFormatter.parse(field, value))
+      }
+
+      Function("gte") { self: Query, field: AssetField, value: Long ->
+        self.gte(field, MediaStoreQueryFormatter.parse(field, value))
+      }
+
+      Function("lt") { self: Query, field: AssetField, value: Long ->
+        self.lt(field, MediaStoreQueryFormatter.parse(field, value))
+      }
+
+      Function("lte") { self: Query, field: AssetField, value: Long ->
+        self.lte(field, MediaStoreQueryFormatter.parse(field, value))
+      }
+
+      Function("orderBy") { self: Query, sortDescriptorRef: Either<AssetField, SortDescriptor> ->
+        if (sortDescriptorRef.`is`(AssetField::class)) {
+          val assetField = sortDescriptorRef.get(AssetField::class)
+          val descriptor = SortDescriptor(assetField)
+          return@Function self.orderBy(descriptor)
+        }
+        val descriptor = sortDescriptorRef.get(SortDescriptor::class)
+        return@Function self.orderBy(descriptor)
+      }
+
+      AsyncFunction("exe") Coroutine { self: Query ->
+        return@Coroutine self.exe()
+      }
+    }
+
     AsyncFunction("createAsset") Coroutine { filePath: Uri, album: Album? ->
       systemPermissionsDelegate.requireSystemPermissions(true)
       return@Coroutine assetFactory.create(filePath, album?.getRelativePath())
@@ -158,6 +226,11 @@ class MediaLibraryNextModule : Module() {
       return@Coroutine albumFactory.createFromFilePaths(name, assetPaths)
     }
 
+    AsyncFunction("getAlbum") Coroutine { title: String ->
+      systemPermissionsDelegate.requireSystemPermissions(false)
+      albumQuery.getAlbum(title)
+    }
+
     AsyncFunction("deleteAlbums") Coroutine { albums: List<Album> ->
       systemPermissionsDelegate.requireSystemPermissions(true)
       albums.forEach { album -> album.delete() }

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

@@ -0,0 +1,6 @@
+package expo.modules.medialibrary.next.exceptions
+
+import expo.modules.kotlin.exception.CodedException
+
+class QueryCouldNotBeExecuted(message: String, cause: Throwable? = null) :
+  CodedException("Could not execute a query $message", cause)

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

@@ -48,6 +48,15 @@ suspend fun ContentResolver.queryAlbumId(relativePath: RelativePath): String? =
     arrayOf(relativePath.value)
   )
 
+suspend fun ContentResolver.queryAlbumId(name: String): String? =
+  queryOne(
+    EXTERNAL_CONTENT_URI,
+    MediaStore.Files.FileColumns.BUCKET_ID,
+    Cursor::getString,
+    "${MediaStore.MediaColumns.BUCKET_DISPLAY_NAME} = ?",
+    arrayOf(name)
+  )
+
 suspend fun ContentResolver.queryAlbumAssetsContentUris(bucketId: String): List<Uri> =
   withContext(Dispatchers.IO) {
     val projection = arrayOf(

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

@@ -17,26 +17,26 @@ import kotlinx.coroutines.withContext
 suspend fun ContentResolver.queryAssetDisplayName(contentUri: Uri): String? =
   queryOne(contentUri, MediaStore.MediaColumns.DISPLAY_NAME, Cursor::getString)
 
-suspend fun ContentResolver.queryGetCreationTime(contentUri: Uri): Long? =
+suspend fun ContentResolver.queryAssetCreationTime(contentUri: Uri): Long? =
   queryOne(contentUri, MediaStore.Images.Media.DATE_TAKEN, Cursor::getLong)
 
 suspend fun ContentResolver.queryAssetModificationTime(contentUri: Uri): Long? =
-  queryOne(contentUri, MediaStore.Images.Media.DATE_MODIFIED, Cursor::getLong)
+  queryOne(contentUri, MediaStore.MediaColumns.DATE_MODIFIED, Cursor::getLong)
 
 suspend fun ContentResolver.queryAssetDuration(contentUri: Uri): Long? =
   queryOne(contentUri, MediaStore.Video.VideoColumns.DURATION, Cursor::getLong)
 
 suspend fun ContentResolver.queryAssetWidth(contentUri: Uri): Int? =
-  queryOne(contentUri, MediaStore.Images.Media.WIDTH, Cursor::getInt)
+  queryOne(contentUri, MediaStore.MediaColumns.WIDTH, Cursor::getInt)
 
 suspend fun ContentResolver.queryAssetHeight(contentUri: Uri): Int? =
-  queryOne(contentUri, MediaStore.Images.Media.HEIGHT, Cursor::getInt)
+  queryOne(contentUri, MediaStore.MediaColumns.HEIGHT, Cursor::getInt)
 
 suspend fun ContentResolver.queryAssetPath(contentUri: Uri): String? =
   queryOne(contentUri, MediaStore.Files.FileColumns.DATA, Cursor::getString)
 
 suspend fun ContentResolver.queryAssetBucketId(contentUri: Uri): Int? =
-  queryOne(contentUri, MediaStore.Images.Media.BUCKET_ID, Cursor::getInt)
+  queryOne(contentUri, MediaStore.MediaColumns.BUCKET_ID, Cursor::getInt)
 
 suspend fun ContentResolver.insertPendingAsset(
   displayName: String,

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

@@ -0,0 +1,22 @@
+package expo.modules.medialibrary.next.objects.album
+
+import android.content.Context
+import expo.modules.medialibrary.next.exceptions.ContentResolverNotObtainedException
+import expo.modules.medialibrary.next.extensions.getOrThrow
+import expo.modules.medialibrary.next.extensions.resolver.queryAlbumId
+import java.lang.ref.WeakReference
+
+class AlbumQuery(context: Context) {
+  private val contextRef = WeakReference(context)
+
+  private val contentResolver
+    get() = contextRef
+      .getOrThrow()
+      .contentResolver ?: throw ContentResolverNotObtainedException()
+
+  suspend fun getAlbum(title: String): Album? {
+    val id = contentResolver.queryAlbumId(title)
+      ?: return null
+    return Album(id, contextRef.getOrThrow())
+  }
+}

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

@@ -8,6 +8,7 @@ import expo.modules.medialibrary.next.extensions.getOrThrow
 import expo.modules.medialibrary.next.objects.wrappers.RelativePath
 import expo.modules.medialibrary.next.objects.asset.delegates.AssetLegacyDelegate
 import expo.modules.medialibrary.next.objects.asset.delegates.AssetModernDelegate
+import expo.modules.medialibrary.next.objects.wrappers.MediaType
 import expo.modules.medialibrary.next.objects.wrappers.MimeType
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -42,7 +43,7 @@ class Asset(contentUri: Uri, context: Context) : SharedObject() {
   suspend fun getWidth(): Int =
     assetDelegate.getWidth()
 
-  suspend fun getMediaType(): String =
+  suspend fun getMediaType(): MediaType =
     assetDelegate.getMediaType()
 
   suspend fun getModificationTime(): Long? =

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

@@ -3,6 +3,7 @@ package expo.modules.medialibrary.next.objects.asset.delegates
 import android.net.Uri
 import expo.modules.medialibrary.next.objects.wrappers.RelativePath
 import expo.modules.medialibrary.next.objects.asset.Asset
+import expo.modules.medialibrary.next.objects.wrappers.MediaType
 import expo.modules.medialibrary.next.objects.wrappers.MimeType
 
 interface AssetDelegate {
@@ -12,7 +13,7 @@ interface AssetDelegate {
   suspend fun getFilename(): String
   suspend fun getHeight(): Int
   suspend fun getWidth(): Int
-  suspend fun getMediaType(): String
+  suspend fun getMediaType(): MediaType
   suspend fun getModificationTime(): Long?
   suspend fun getUri(): Uri
   suspend fun getMimeType(): MimeType

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

@@ -19,16 +19,19 @@ import expo.modules.medialibrary.next.extensions.resolver.queryAssetHeight
 import expo.modules.medialibrary.next.extensions.resolver.queryAssetModificationTime
 import expo.modules.medialibrary.next.extensions.resolver.queryAssetPath
 import expo.modules.medialibrary.next.extensions.resolver.queryAssetWidth
-import expo.modules.medialibrary.next.extensions.resolver.queryGetCreationTime
+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.objects.wrappers.RelativePath
 import expo.modules.medialibrary.next.objects.asset.Asset
+import expo.modules.medialibrary.next.objects.wrappers.MediaType
 import expo.modules.medialibrary.next.objects.wrappers.MimeType
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.File
 import java.lang.ref.WeakReference
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 @DeprecatedSinceApi(Build.VERSION_CODES.Q)
 class AssetLegacyDelegate(contentUri: Uri, context: Context) : AssetDelegate {
@@ -49,7 +52,7 @@ class AssetLegacyDelegate(contentUri: Uri, context: Context) : AssetDelegate {
 
   override suspend fun getCreationTime(): Long? {
     return contentResolver
-      .queryGetCreationTime(contentUri)
+      .queryAssetCreationTime(contentUri)
       .takeIf { it != 0L }
   }
 
@@ -71,7 +74,7 @@ class AssetLegacyDelegate(contentUri: Uri, context: Context) : AssetDelegate {
     val height = contentResolver.queryAssetHeight(contentUri)
       ?: throw AssetPropertyNotFoundException("Height")
     // If height is not saved to the database
-    if (getMediaType().contains("image") && height <= 0) {
+    if (getMediaType() == MediaType.IMAGE && height <= 0) {
       return downloadBitmapAndGet { it.outHeight }
     }
     return height
@@ -80,7 +83,7 @@ class AssetLegacyDelegate(contentUri: Uri, context: Context) : AssetDelegate {
   override suspend fun getWidth(): Int {
     val width = contentResolver.queryAssetWidth(contentUri)
       ?: throw AssetPropertyNotFoundException("Width")
-    if (getMediaType().contains("image") && width <= 0) {
+    if (getMediaType() == MediaType.IMAGE && width <= 0) {
       return downloadBitmapAndGet { it.outWidth }
     }
     return width
@@ -93,12 +96,14 @@ class AssetLegacyDelegate(contentUri: Uri, context: Context) : AssetDelegate {
     return extract(options)
   }
 
-  override suspend fun getMediaType(): String =
-    contentResolver.getType(contentUri)
-      ?: throw AssetPropertyNotFoundException("MediaType")
+  override suspend fun getMediaType(): MediaType =
+    MediaType.fromContentUri(contentUri)
 
   override suspend fun getModificationTime(): Long? =
-    contentResolver.queryAssetModificationTime(contentUri).takeIf { it != 0L }
+    contentResolver.queryAssetModificationTime(contentUri)
+      ?.takeIf { it != 0L }
+      ?.toDuration(DurationUnit.SECONDS)
+      ?.inWholeMilliseconds
 
   override suspend fun getMimeType(): MimeType {
     return contentResolver.getType(contentUri)?.let { MimeType(it) }

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

@@ -18,15 +18,18 @@ import expo.modules.medialibrary.next.extensions.resolver.queryAssetHeight
 import expo.modules.medialibrary.next.extensions.resolver.queryAssetModificationTime
 import expo.modules.medialibrary.next.extensions.resolver.queryAssetPath
 import expo.modules.medialibrary.next.extensions.resolver.queryAssetWidth
-import expo.modules.medialibrary.next.extensions.resolver.queryGetCreationTime
+import expo.modules.medialibrary.next.extensions.resolver.queryAssetCreationTime
 import expo.modules.medialibrary.next.extensions.resolver.updateRelativePath
 import expo.modules.medialibrary.next.objects.wrappers.RelativePath
 import expo.modules.medialibrary.next.objects.asset.Asset
+import expo.modules.medialibrary.next.objects.wrappers.MediaType
 import expo.modules.medialibrary.next.objects.wrappers.MimeType
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import java.io.File
 import java.lang.ref.WeakReference
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
 
 @RequiresApi(Build.VERSION_CODES.Q)
 class AssetModernDelegate(override val contentUri: Uri, context: Context) : AssetDelegate {
@@ -39,7 +42,7 @@ class AssetModernDelegate(override val contentUri: Uri, context: Context) : Asse
 
   override suspend fun getCreationTime(): Long? {
     return contentResolver
-      .queryGetCreationTime(contentUri)
+      .queryAssetCreationTime(contentUri)
       .takeIf { it != 0L }
   }
 
@@ -61,7 +64,7 @@ class AssetModernDelegate(override val contentUri: Uri, context: Context) : Asse
     val height = contentResolver.queryAssetHeight(contentUri)
       ?: throw AssetPropertyNotFoundException("Height")
     // If height is not saved to the database
-    if (getMediaType().contains("image") && height <= 0) {
+    if (getMediaType() == MediaType.IMAGE && height <= 0) {
       return downloadBitmapAndGet { it.outHeight }
     }
     return height
@@ -70,7 +73,7 @@ class AssetModernDelegate(override val contentUri: Uri, context: Context) : Asse
   override suspend fun getWidth(): Int {
     val width = contentResolver.queryAssetWidth(contentUri)
       ?: throw AssetPropertyNotFoundException("Width")
-    if (getMediaType().contains("image") && width <= 0) {
+    if (getMediaType() == MediaType.IMAGE && width <= 0) {
       return downloadBitmapAndGet { it.outWidth }
     }
     return width
@@ -83,12 +86,14 @@ class AssetModernDelegate(override val contentUri: Uri, context: Context) : Asse
     return extract(options)
   }
 
-  override suspend fun getMediaType(): String =
-    contentResolver.getType(contentUri)
-      ?: throw AssetPropertyNotFoundException("MediaType")
+  override suspend fun getMediaType(): MediaType =
+    MediaType.fromContentUri(contentUri)
 
   override suspend fun getModificationTime(): Long? =
-    contentResolver.queryAssetModificationTime(contentUri).takeIf { it != 0L }
+    contentResolver.queryAssetModificationTime(contentUri)
+      ?.takeIf { it != 0L }
+      ?.toDuration(DurationUnit.SECONDS)
+      ?.inWholeMilliseconds
 
   override suspend fun getUri(): Uri {
     // e.g. storage/emulated/0/Android/data/expo/files/[ROOT_ALBUM]/[ALBUM_NAME]

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

@@ -35,7 +35,7 @@ class AssetLegacyFactory(context: Context) : AssetFactory {
     val baseDir = if (relativePath != null) {
       File(relativePath.toFilePath())
     } else {
-      mimeType.externalStoragePublicDirectory()
+      mimeType.externalStorageAssetDirectory()
     }
     baseDir.mkdirs()
 

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

@@ -0,0 +1,31 @@
+package expo.modules.medialibrary.next.objects.query
+
+import expo.modules.kotlin.apifeatures.EitherType
+import expo.modules.kotlin.types.Either
+import expo.modules.medialibrary.next.objects.wrappers.MediaType
+import expo.modules.medialibrary.next.records.AssetField
+import kotlin.time.DurationUnit
+import kotlin.time.toDuration
+
+@OptIn(EitherType::class)
+class MediaStoreQueryFormatter {
+  companion object {
+    fun parse(field: AssetField, value: Either<MediaType, Long>): String {
+      if (value.`is`(MediaType::class)) {
+        return parse(value.get(MediaType::class))
+      }
+      return parse(field, value.get(Long::class))
+    }
+
+    fun parse(field: AssetField, value: Long): String {
+      if (field == AssetField.MODIFICATION_TIME) {
+        return value.toDuration(DurationUnit.MILLISECONDS).inWholeSeconds.toString()
+      }
+      return value.toString()
+    }
+
+    fun parse(value: MediaType): String {
+      return value.toMediaStoreValue().toString()
+    }
+  }
+}

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

@@ -0,0 +1,108 @@
+package expo.modules.medialibrary.next.objects.query
+
+import android.content.Context
+import android.os.Build
+import android.provider.MediaStore
+import expo.modules.kotlin.sharedobjects.SharedObject
+import expo.modules.medialibrary.next.exceptions.ContentResolverNotObtainedException
+import expo.modules.medialibrary.next.extensions.asIterable
+import expo.modules.medialibrary.next.extensions.getOrThrow
+import expo.modules.medialibrary.next.extensions.resolver.extractAssetContentUri
+import expo.modules.medialibrary.next.objects.album.Album
+import expo.modules.medialibrary.next.objects.asset.Asset
+import expo.modules.medialibrary.next.objects.query.builder.QueryLegacyExecutor
+import expo.modules.medialibrary.next.objects.query.builder.QueryModernExecutor
+import expo.modules.medialibrary.next.records.AssetField
+import expo.modules.medialibrary.next.records.SortDescriptor
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ensureActive
+import kotlinx.coroutines.withContext
+import java.lang.ref.WeakReference
+import kotlin.collections.joinToString
+
+class Query(context: Context) : SharedObject() {
+  private val contextRef = WeakReference(context)
+
+  private val contentResolver
+    get() = contextRef
+      .getOrThrow()
+      .contentResolver ?: throw ContentResolverNotObtainedException()
+
+  private val clauses = mutableListOf<String>()
+  private val args = mutableListOf<String>()
+  private val orderBy = mutableListOf<SortDescriptor>()
+
+  private var limit: Int? = null
+  private var offset: Int? = null
+
+  fun eq(field: AssetField, value: String) = apply {
+    clauses.add("${field.toMediaStoreColumn()} = ?")
+    args.add(value)
+  }
+
+  fun within(field: AssetField, values: List<String>) = apply {
+    val questionMarks = values.joinToString(", ") { "?" }
+    clauses.add("${field.toMediaStoreColumn()} IN ($questionMarks)")
+    args.addAll(values)
+  }
+
+  fun gt(field: AssetField, value: String) = apply {
+    clauses.add("${field.toMediaStoreColumn()} > ?")
+    args.add(value)
+  }
+
+  fun gte(field: AssetField, value: String) = apply {
+    clauses.add("${field.toMediaStoreColumn()} >= ?")
+    args.add(value)
+  }
+
+  fun lt(field: AssetField, value: String) = apply {
+    clauses.add("${field.toMediaStoreColumn()} < ?")
+    args.add(value)
+  }
+
+  fun lte(field: AssetField, value: String) = apply {
+    clauses.add("${field.toMediaStoreColumn()} <= ?")
+    args.add(value)
+  }
+
+  fun limit(limit: Int) = apply {
+    this.limit = limit
+  }
+
+  fun album(album: Album) = apply {
+    clauses.add("${MediaStore.MediaColumns.BUCKET_ID} = ?")
+    args.add(album.id)
+  }
+
+  fun offset(count: Int) = apply {
+    this.offset = count
+  }
+
+  fun orderBy(descriptor: SortDescriptor) = apply {
+    orderBy.add(descriptor)
+  }
+
+  suspend fun exe(): List<Asset> = withContext(Dispatchers.IO) {
+    val queryExecutor = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+      QueryModernExecutor(clauses, args, orderBy, limit, offset)
+    } else {
+      QueryLegacyExecutor(clauses, args, orderBy, limit, offset)
+    }
+    val projection = arrayOf(
+      MediaStore.Files.FileColumns._ID,
+      MediaStore.Files.FileColumns.MEDIA_TYPE
+    )
+
+    val cursor = queryExecutor.exe(projection, contentResolver)
+    return@withContext cursor.use {
+      ensureActive()
+      val idColumn = it.getColumnIndexOrThrow(MediaStore.Files.FileColumns._ID)
+      val typeColumn = it.getColumnIndexOrThrow(MediaStore.Files.FileColumns.MEDIA_TYPE)
+      it.asIterable()
+        .map { row -> row.extractAssetContentUri(idColumn, typeColumn) }
+        .map { uri -> Asset(uri, contextRef.getOrThrow()) }
+        .toList()
+    }
+  }
+}

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

@@ -0,0 +1,8 @@
+package expo.modules.medialibrary.next.objects.query.builder
+
+import android.content.ContentResolver
+import android.database.Cursor
+
+fun interface QueryExecutor {
+  suspend fun exe(projection: Array<String>, contentResolver: ContentResolver): Cursor
+}

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

@@ -0,0 +1,73 @@
+package expo.modules.medialibrary.next.objects.query.builder
+
+import android.content.ContentResolver
+import android.database.Cursor
+import android.os.Build
+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.records.SortDescriptor
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+@DeprecatedSinceApi(Build.VERSION_CODES.Q)
+class QueryLegacyExecutor(
+  private val clauses: MutableList<String>,
+  private val args: MutableList<String>,
+  private val sortDescriptors: MutableList<SortDescriptor>,
+  private val limit: Int?,
+  private val offset: Int?
+) : QueryExecutor {
+  override suspend fun exe(
+    projection: Array<String>,
+    contentResolver: ContentResolver
+  ): Cursor = withContext(Dispatchers.IO) {
+    val selection = buildSelection()
+    val sortOrder = buildSortOrder()
+    val selectionArgs = args.toTypedArray()
+    return@withContext contentResolver.query(EXTERNAL_CONTENT_URI, projection, selection, selectionArgs, sortOrder)
+      ?: throw QueryCouldNotBeExecuted("Cursor is null")
+  }
+
+  private fun buildSortOrder(): String {
+    var sortOrder = buildOrderBy()
+    sortOrder = addLimit(sortOrder)
+    return addOffset(sortOrder)
+  }
+
+  private fun buildSelection(): String {
+    return clauses.joinToString(" AND ")
+  }
+
+  private fun buildOrderBy(): String? {
+    return if (!sortDescriptors.isEmpty()) {
+      sortDescriptors.joinToString(", ") { it.toMediaStoreQueryString() }
+    } else {
+      null
+    }
+  }
+
+  private fun addLimit(sortOrder: String?): String {
+    return if (limit != null) {
+      requireNotEmptySortOrder(sortOrder) + " LIMIT $limit"
+    } else if (offset != null) {
+      // SQLITE: limit is required to perform offset
+      requireNotEmptySortOrder(sortOrder) + " LIMIT -1"
+    } else {
+      sortOrder ?: ""
+    }
+  }
+
+  private fun requireNotEmptySortOrder(sortOrder: String?): String {
+    return sortOrder ?: MediaStore.Files.FileColumns._ID
+  }
+
+  private fun addOffset(orderBy: String): String {
+    return if (offset != null) {
+      "$orderBy OFFSET $offset"
+    } else {
+      orderBy
+    }
+  }
+}