expo-media-library 18.3.0-canary-20251120-e46b3cc → 18.3.0-canary-20251205-756eb7a

package/CHANGELOG.md

@@ -6,6 +6,8 @@
 
 ### 🎉 New features
 
+- [next] Add `asset.getShape()` ([#40110](https://github.com/expo/expo/pull/40110) by [@Wenszel](https://github.com/Wenszel))
+- [next] Add `asset.getInfo()` ([#40146](https://github.com/expo/expo/pull/40146) by [@Wenszel](https://github.com/Wenszel))
 - [next] Add exif support ([#39992](https://github.com/expo/expo/pull/39992) by [@Wenszel](https://github.com/Wenszel))
 - [next] Add `Album.get(title)` ([#39717](https://github.com/expo/expo/pull/39717) by [@Wenszel](https://github.com/Wenszel))
 
@@ -23,6 +25,11 @@
 - [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))
+- [Android] Add `android:maxSdkVersion` annotation to  `READ_EXTERNAL_STORAGE` and `WRITE_EXTERNAL_STORAGE` permissions. ([#40976](https://github.com/expo/expo/pull/40976) by [@behenate](https://github.com/behenate))
+
+## 18.2.1 - 2025-12-05
+
+_This version does not introduce any user-facing changes._
 
 ## 18.2.0 — 2025-09-16
 

package/android/build.gradle

@@ -4,13 +4,13 @@ plugins {
 }
 
 group = 'host.exp.exponent'
-version = '18.3.0-canary-20251120-e46b3cc'
+version = '18.3.0-canary-20251205-756eb7a'
 
 android {
   namespace "expo.modules.medialibrary"
   defaultConfig {
     versionCode 37
-    versionName "18.3.0-canary-20251120-e46b3cc"
+    versionName "18.3.0-canary-20251205-756eb7a"
   }
 }
 

package/android/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
 </manifest>

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

@@ -93,6 +93,10 @@ class MediaLibraryNextModule : Module() {
         self.getExif()
       }
 
+      AsyncFunction("getInfo") Coroutine { self: Asset ->
+        self.getInfo()
+      }
+
       AsyncFunction("getLocation") Coroutine { self: Asset ->
         self.getLocation()
       }
@@ -113,6 +117,10 @@ class MediaLibraryNextModule : Module() {
         self.getModificationTime()
       }
 
+      AsyncFunction("getShape") Coroutine { self: Asset ->
+        self.getShape()
+      }
+
       AsyncFunction("getUri") Coroutine { self: Asset ->
         self.getUri()
       }

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

@@ -9,34 +9,54 @@ import android.provider.MediaStore
 import androidx.annotation.RequiresApi
 import expo.modules.medialibrary.EXTERNAL_CONTENT_URI
 import expo.modules.medialibrary.next.exceptions.AssetCouldNotBeCreated
+import expo.modules.medialibrary.next.extensions.resolver.AssetMediaStoreItemBuilder.Companion.buildAssetMediaStoreItem
+import expo.modules.medialibrary.next.objects.wrappers.MediaType
 import expo.modules.medialibrary.next.objects.wrappers.RelativePath
 import expo.modules.medialibrary.next.objects.wrappers.MimeType
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
 suspend fun ContentResolver.queryAssetDisplayName(contentUri: Uri): String? =
-  queryOne(contentUri, MediaStore.MediaColumns.DISPLAY_NAME, Cursor::getString)
+  queryOne(contentUri, AssetMediaStoreProperty.DisplayName.column, Cursor::getString)
 
-suspend fun ContentResolver.queryAssetCreationTime(contentUri: Uri): Long? =
-  queryOne(contentUri, MediaStore.Images.Media.DATE_TAKEN, Cursor::getLong)
+suspend fun ContentResolver.queryAssetDateTaken(contentUri: Uri): Long? =
+  queryOne(contentUri, AssetMediaStoreProperty.DateTaken.column, Cursor::getLong)
 
-suspend fun ContentResolver.queryAssetModificationTime(contentUri: Uri): Long? =
-  queryOne(contentUri, MediaStore.MediaColumns.DATE_MODIFIED, Cursor::getLong)
+suspend fun ContentResolver.queryAssetDateModified(contentUri: Uri): Long? =
+  queryOne(contentUri, AssetMediaStoreProperty.DateModified.column, Cursor::getLong)
 
 suspend fun ContentResolver.queryAssetDuration(contentUri: Uri): Long? =
-  queryOne(contentUri, MediaStore.Video.VideoColumns.DURATION, Cursor::getLong)
+  queryOne(contentUri, AssetMediaStoreProperty.Duration.column, Cursor::getLong)
 
 suspend fun ContentResolver.queryAssetWidth(contentUri: Uri): Int? =
-  queryOne(contentUri, MediaStore.MediaColumns.WIDTH, Cursor::getInt)
+  queryOne(contentUri, AssetMediaStoreProperty.Width.column, Cursor::getInt)
 
 suspend fun ContentResolver.queryAssetHeight(contentUri: Uri): Int? =
-  queryOne(contentUri, MediaStore.MediaColumns.HEIGHT, Cursor::getInt)
+  queryOne(contentUri, AssetMediaStoreProperty.Height.column, Cursor::getInt)
 
-suspend fun ContentResolver.queryAssetPath(contentUri: Uri): String? =
-  queryOne(contentUri, MediaStore.Files.FileColumns.DATA, Cursor::getString)
+suspend fun ContentResolver.queryAssetData(contentUri: Uri): String? =
+  queryOne(contentUri, AssetMediaStoreProperty.Data.column, Cursor::getString)
 
 suspend fun ContentResolver.queryAssetBucketId(contentUri: Uri): Int? =
-  queryOne(contentUri, MediaStore.MediaColumns.BUCKET_ID, Cursor::getInt)
+  queryOne(contentUri, AssetMediaStoreProperty.BucketId.column, Cursor::getInt)
+
+suspend fun ContentResolver.queryAssetMediaStoreItem(
+  contentUri: Uri
+): AssetMediaStoreItem? = withContext(Dispatchers.IO) {
+  // Attempting to get a duration from an image may result in an exception on older Android versions
+  val includeDuration = MediaType.fromContentUri(contentUri) != MediaType.IMAGE
+  val projection = AssetMediaStoreProperty.projection(includeDuration)
+  val cursor = safeQuery(contentUri, projection, null, null)
+    ?: return@withContext null
+
+  return@withContext cursor.use {
+    if (it.moveToFirst()) {
+      it.buildAssetMediaStoreItem(includeDuration)
+    } else {
+      null
+    }
+  }
+}
 
 suspend fun ContentResolver.insertPendingAsset(
   displayName: String,

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

@@ -0,0 +1,100 @@
+package expo.modules.medialibrary.next.extensions.resolver
+
+import android.database.Cursor
+import android.provider.MediaStore
+
+data class AssetMediaStoreItem(
+  val displayName: String?,
+  val height: Int?,
+  val width: Int?,
+  val dateTaken: Long?,
+  val dateModified: Long?,
+  val duration: Long?,
+  val data: String?,
+  val bucketId: String?
+)
+
+class AssetMediaStoreItemBuilder {
+  private var displayName: String? = null
+  private var height: Int? = null
+  private var width: Int? = null
+  private var dateTaken: Long? = null
+  private var dateModified: Long? = null
+  private var duration: Long? = null
+  private var data: String? = null
+  private var bucketId: String? = null
+
+  fun build(): AssetMediaStoreItem {
+    return AssetMediaStoreItem(
+      displayName = displayName,
+      height = height,
+      width = width,
+      dateTaken = dateTaken,
+      dateModified = dateModified,
+      duration = duration,
+      data = data,
+      bucketId = bucketId
+    )
+  }
+
+  fun Cursor.set(property: AssetMediaStoreProperty) {
+    with(property) {
+      when (property) {
+        AssetMediaStoreProperty.Data -> data = getString()
+        AssetMediaStoreProperty.DisplayName -> displayName = getString()
+        AssetMediaStoreProperty.Height -> height = getInt()
+        AssetMediaStoreProperty.Width -> width = getInt()
+        AssetMediaStoreProperty.DateTaken -> dateTaken = getLong()
+        AssetMediaStoreProperty.DateModified -> dateModified = getLong()
+        AssetMediaStoreProperty.Duration -> duration = getLong()
+        AssetMediaStoreProperty.BucketId -> bucketId = getString()
+      }
+    }
+  }
+
+  companion object {
+    fun Cursor.buildAssetMediaStoreItem(includeDuration: Boolean): AssetMediaStoreItem {
+      val assetMediaStoreItemBuilder = AssetMediaStoreItemBuilder()
+      AssetMediaStoreProperty
+        .values()
+        .filter { includeDuration || it != AssetMediaStoreProperty.Duration }
+        .forEach {
+          with(assetMediaStoreItemBuilder) {
+            set(it)
+          }
+        }
+      return assetMediaStoreItemBuilder.build()
+    }
+  }
+}
+
+enum class AssetMediaStoreProperty(val column: String) {
+  DisplayName(MediaStore.Files.FileColumns.DISPLAY_NAME),
+  Height(MediaStore.MediaColumns.HEIGHT),
+  Width(MediaStore.MediaColumns.WIDTH),
+  DateTaken(MediaStore.Images.ImageColumns.DATE_TAKEN),
+  DateModified(MediaStore.MediaColumns.DATE_MODIFIED),
+  Duration(MediaStore.MediaColumns.DURATION),
+  Data(MediaStore.MediaColumns.DATA),
+  BucketId(MediaStore.MediaColumns.BUCKET_ID);
+
+  fun Cursor.columnIndex(): Int =
+    getColumnIndexOrThrow(column)
+
+  fun Cursor.getString(): String? =
+    getString(columnIndex())
+
+  fun Cursor.getInt(): Int? =
+    getInt(columnIndex())
+
+  fun Cursor.getLong(): Long? =
+    getLong(columnIndex())
+
+  companion object {
+    fun projection(includeDuration: Boolean): Array<String> =
+      values()
+        .filter { includeDuration || it != Duration }
+        .map { it.column }
+        .toTypedArray()
+  }
+}

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

@@ -7,7 +7,9 @@ import expo.modules.medialibrary.next.objects.asset.delegates.AssetDelegate
 import expo.modules.medialibrary.next.objects.wrappers.RelativePath
 import expo.modules.medialibrary.next.objects.wrappers.MediaType
 import expo.modules.medialibrary.next.objects.wrappers.MimeType
+import expo.modules.medialibrary.next.records.AssetInfo
 import expo.modules.medialibrary.next.records.Location
+import expo.modules.medialibrary.next.records.Shape
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 
@@ -29,6 +31,9 @@ class Asset(val assetDelegate: AssetDelegate) : SharedObject() {
   suspend fun getWidth(): Int =
     assetDelegate.getWidth()
 
+  suspend fun getShape(): Shape? =
+    assetDelegate.getShape()
+
   suspend fun getMediaType(): MediaType =
     assetDelegate.getMediaType()
 
@@ -38,6 +43,9 @@ class Asset(val assetDelegate: AssetDelegate) : SharedObject() {
   suspend fun getUri(): Uri =
     assetDelegate.getUri()
 
+  suspend fun getInfo(): AssetInfo =
+    assetDelegate.getInfo()
+
   suspend fun getMimeType(): MimeType =
     assetDelegate.getMimeType()
 

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

@@ -6,7 +6,9 @@ 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 expo.modules.medialibrary.next.records.AssetInfo
 import expo.modules.medialibrary.next.records.Location
+import expo.modules.medialibrary.next.records.Shape
 
 interface AssetDelegate {
   val contentUri: Uri
@@ -15,9 +17,11 @@ interface AssetDelegate {
   suspend fun getFilename(): String
   suspend fun getHeight(): Int
   suspend fun getWidth(): Int
+  suspend fun getShape(): Shape?
   suspend fun getMediaType(): MediaType
   suspend fun getModificationTime(): Long?
   suspend fun getUri(): Uri
+  suspend fun getInfo(): AssetInfo
   suspend fun getMimeType(): MimeType
   suspend fun getLocation(): Location?
   suspend fun getExif(): Bundle

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

@@ -1,12 +1,10 @@
 package expo.modules.medialibrary.next.objects.asset.delegates
 
 import android.content.Context
-import android.graphics.BitmapFactory
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import androidx.annotation.DeprecatedSinceApi
-import androidx.core.net.toUri
 import androidx.exifinterface.media.ExifInterface
 import expo.modules.medialibrary.next.exceptions.AssetCouldNotBeCreated
 import expo.modules.medialibrary.next.exceptions.AssetPropertyNotFoundException
@@ -16,10 +14,11 @@ import expo.modules.medialibrary.next.extensions.resolver.deleteBy
 import expo.modules.medialibrary.next.extensions.resolver.queryAssetDisplayName
 import expo.modules.medialibrary.next.extensions.resolver.queryAssetDuration
 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.queryAssetCreationTime
+import expo.modules.medialibrary.next.extensions.resolver.queryAssetData
+import expo.modules.medialibrary.next.extensions.resolver.queryAssetDateModified
+import expo.modules.medialibrary.next.extensions.resolver.queryAssetDateTaken
+import expo.modules.medialibrary.next.extensions.resolver.queryAssetMediaStoreItem
 import expo.modules.medialibrary.next.extensions.safeCopy
 import expo.modules.medialibrary.next.extensions.safeMove
 import expo.modules.medialibrary.next.extensions.scanFile
@@ -30,7 +29,9 @@ 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.AssetInfo
 import expo.modules.medialibrary.next.records.Location
+import expo.modules.medialibrary.next.records.Shape
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.withContext
@@ -38,8 +39,6 @@ import java.io.File
 import java.lang.ref.WeakReference
 import kotlin.collections.component1
 import kotlin.collections.component2
-import kotlin.time.DurationUnit
-import kotlin.time.toDuration
 
 @DeprecatedSinceApi(Build.VERSION_CODES.Q)
 class AssetLegacyDelegate(
@@ -63,20 +62,21 @@ class AssetLegacyDelegate(
   override var contentUri: Uri = contentUri
     private set
 
+  private val mediaStoreToAssetAdapter by lazy {
+    MediaStoreToAssetAdapter(contextRef.getOrThrow())
+  }
+
   override suspend fun getCreationTime(): Long? {
-    return contentResolver
-      .queryAssetCreationTime(contentUri)
-      .takeIf { it != 0L }
+    val mediaStoreDateTaken = contentResolver.queryAssetDateTaken(contentUri)
+    return mediaStoreToAssetAdapter.transformCreationTime(mediaStoreDateTaken)
   }
 
   override suspend fun getDuration(): Long? {
-    return if (getMimeType().isVideo()) {
-      contentResolver
-        .queryAssetDuration(contentUri)
-        .takeIf { it != 0L }
-    } else {
-      null
+    if (getMediaType() != MediaType.VIDEO) {
+      return null
     }
+    val mediaStoreDuration = contentResolver.queryAssetDuration(contentUri)
+    return mediaStoreToAssetAdapter.transformDuration(mediaStoreDuration)
   }
 
   override suspend fun getFilename(): String =
@@ -84,39 +84,61 @@ class AssetLegacyDelegate(
       ?: throw AssetPropertyNotFoundException("Filename")
 
   override suspend fun getHeight(): Int {
-    val height = contentResolver.queryAssetHeight(contentUri)
+    val mediaStoreHeight = contentResolver.queryAssetHeight(contentUri)
+    return mediaStoreToAssetAdapter.transformHeight(mediaStoreHeight, contentUri)
       ?: throw AssetPropertyNotFoundException("Height")
-    // If height is not saved to the database
-    if (getMediaType() == MediaType.IMAGE && height <= 0) {
-      return downloadBitmapAndGet { it.outHeight }
-    }
-    return height
   }
 
   override suspend fun getWidth(): Int {
-    val width = contentResolver.queryAssetWidth(contentUri)
+    val mediaStoreWidth = contentResolver.queryAssetWidth(contentUri)
+    return mediaStoreToAssetAdapter.transformWidth(mediaStoreWidth, contentUri)
       ?: throw AssetPropertyNotFoundException("Width")
-    if (getMediaType() == MediaType.IMAGE && width <= 0) {
-      return downloadBitmapAndGet { it.outWidth }
-    }
-    return width
   }
 
-  private suspend fun downloadBitmapAndGet(extract: (BitmapFactory.Options) -> Int): Int {
-    val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
-    val stringAssetUri = contentResolver.queryAssetPath(contentUri)
-    BitmapFactory.decodeFile(stringAssetUri, options)
-    return extract(options)
+  override suspend fun getShape(): Shape? {
+    val width = getWidth()
+    val height = getHeight()
+    return Shape(width, height).takeIf { width > 0 && height > 0 }
   }
 
   override suspend fun getMediaType(): MediaType =
     MediaType.fromContentUri(contentUri)
 
-  override suspend fun getModificationTime(): Long? =
-    contentResolver.queryAssetModificationTime(contentUri)
-      ?.takeIf { it != 0L }
-      ?.toDuration(DurationUnit.SECONDS)
-      ?.inWholeMilliseconds
+  override suspend fun getModificationTime(): Long? {
+    val mediaStoreDateModified = contentResolver.queryAssetDateModified(contentUri)
+    return mediaStoreToAssetAdapter.transformModificationTime(mediaStoreDateModified)
+  }
+
+  override suspend fun getUri(): Uri {
+    // e.g. storage/emulated/0/Android/data/expo/files/[ROOT_ALBUM]/[ALBUM_NAME]
+    val mediaStoreData = contentResolver.queryAssetData(contentUri)
+    // e.g. file:///storage/emulated/0/Android/data/expo/files/[ROOT_ALBUM]/[ALBUM_NAME]
+    return mediaStoreToAssetAdapter.transformUri(mediaStoreData)
+      ?: throw AssetPropertyNotFoundException("Uri")
+  }
+
+  override suspend fun getInfo(): AssetInfo {
+    val mediaStoreItem = contentResolver.queryAssetMediaStoreItem(contentUri)
+      ?: throw AssetPropertyNotFoundException("Info")
+    val mediaType = getMediaType()
+    val height = mediaStoreToAssetAdapter.transformHeight(mediaStoreItem.height, contentUri)
+    val width = mediaStoreToAssetAdapter.transformWidth(mediaStoreItem.width, contentUri)
+    return AssetInfo(
+      id = contentUri,
+      mediaType = mediaType,
+      creationTime = mediaStoreToAssetAdapter.transformCreationTime(mediaStoreItem.dateTaken),
+      modificationTime = mediaStoreToAssetAdapter.transformModificationTime(mediaStoreItem.dateModified),
+      duration = mediaStoreToAssetAdapter.transformDuration(mediaStoreItem.duration),
+      filename = mediaStoreItem.displayName
+        ?: throw AssetPropertyNotFoundException("Filename"),
+      height = height
+        ?: throw AssetPropertyNotFoundException("Height"),
+      width = width
+        ?: throw AssetPropertyNotFoundException("Width"),
+      uri = mediaStoreToAssetAdapter.transformUri(mediaStoreItem.data)
+        ?: throw AssetPropertyNotFoundException("Uri")
+    )
+  }
 
   override suspend fun getMimeType(): MimeType {
     return contentResolver.getType(contentUri)?.let { MimeType(it) }
@@ -158,18 +180,9 @@ class AssetLegacyDelegate(
     assetDeleter.delete(contentUri)
   }
 
-  override suspend fun getUri(): Uri {
-    // e.g. storage/emulated/0/Android/data/expo/files/[ROOT_ALBUM]/[ALBUM_NAME]
-    val path = contentResolver.queryAssetPath(contentUri)
-      ?: throw AssetPropertyNotFoundException("Uri")
-    // e.g. file:///storage/emulated/0/Android/data/expo/files/[ROOT_ALBUM]/[ALBUM_NAME]
-    val uri = File(path).toUri()
-    return uri
-  }
-
   override suspend fun move(relativePath: RelativePath) = withContext(Dispatchers.IO) {
     systemPermissionsDelegate.requireWritePermissions()
-    val path = contentResolver.queryAssetPath(contentUri)
+    val path = contentResolver.queryAssetData(contentUri)
       ?: throw AssetPropertyNotFoundException("Asset path")
     val newFile = File(path).safeMove(File(relativePath.toFilePath()))
     contentResolver.deleteBy(path)
@@ -179,7 +192,7 @@ class AssetLegacyDelegate(
   }
 
   override suspend fun copy(relativePath: RelativePath): Asset = withContext(Dispatchers.IO) {
-    val path = contentResolver.queryAssetPath(contentUri)
+    val path = contentResolver.queryAssetData(contentUri)
       ?: throw AssetPropertyNotFoundException("Asset path")
     val newFile = File(path).safeCopy(File(relativePath.toFilePath()))
     val (_, uri) = contextRef.getOrThrow().scanFile(newFile.path, null)

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

@@ -1,13 +1,11 @@
 package expo.modules.medialibrary.next.objects.asset.delegates
 
 import android.content.Context
-import android.graphics.BitmapFactory
 import androidx.exifinterface.media.ExifInterface
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import androidx.annotation.RequiresApi
-import androidx.core.net.toUri
 import expo.modules.medialibrary.next.exceptions.AssetPropertyNotFoundException
 import expo.modules.medialibrary.next.exceptions.ContentResolverNotObtainedException
 import expo.modules.medialibrary.next.extensions.getOrThrow
@@ -17,10 +15,11 @@ import expo.modules.medialibrary.next.extensions.resolver.publishPendingAsset
 import expo.modules.medialibrary.next.extensions.resolver.queryAssetDisplayName
 import expo.modules.medialibrary.next.extensions.resolver.queryAssetDuration
 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.queryAssetCreationTime
+import expo.modules.medialibrary.next.extensions.resolver.queryAssetData
+import expo.modules.medialibrary.next.extensions.resolver.queryAssetDateModified
+import expo.modules.medialibrary.next.extensions.resolver.queryAssetDateTaken
+import expo.modules.medialibrary.next.extensions.resolver.queryAssetMediaStoreItem
 import expo.modules.medialibrary.next.extensions.resolver.updateRelativePath
 import expo.modules.medialibrary.next.objects.wrappers.RelativePath
 import expo.modules.medialibrary.next.objects.asset.Asset
@@ -29,17 +28,16 @@ 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.AssetInfo
 import expo.modules.medialibrary.next.records.Location
+import expo.modules.medialibrary.next.records.Shape
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ensureActive
 import kotlinx.coroutines.withContext
-import java.io.File
 import java.lang.ref.WeakReference
 import kotlin.collections.component1
 import kotlin.collections.component2
 import kotlin.let
-import kotlin.time.DurationUnit
-import kotlin.time.toDuration
 
 @RequiresApi(Build.VERSION_CODES.Q)
 class AssetModernDelegate(
@@ -55,20 +53,21 @@ class AssetModernDelegate(
       .getOrThrow()
       .contentResolver ?: throw ContentResolverNotObtainedException()
 
+  private val mediaStoreToAssetAdapter by lazy {
+    MediaStoreToAssetAdapter(contextRef.getOrThrow())
+  }
+
   override suspend fun getCreationTime(): Long? {
-    return contentResolver
-      .queryAssetCreationTime(contentUri)
-      .takeIf { it != 0L }
+    val mediaStoreDateTaken = contentResolver.queryAssetDateTaken(contentUri)
+    return mediaStoreToAssetAdapter.transformCreationTime(mediaStoreDateTaken)
   }
 
   override suspend fun getDuration(): Long? {
-    return if (getMimeType().isVideo()) {
-      contentResolver
-        .queryAssetDuration(contentUri)
-        .takeIf { it != 0L }
-    } else {
-      null
+    if (getMediaType() != MediaType.VIDEO) {
+      return null
     }
+    val mediaStoreDuration = contentResolver.queryAssetDuration(contentUri)
+    return mediaStoreToAssetAdapter.transformDuration(mediaStoreDuration)
   }
 
   override suspend fun getFilename(): String =
@@ -76,45 +75,60 @@ class AssetModernDelegate(
       ?: throw AssetPropertyNotFoundException("Filename")
 
   override suspend fun getHeight(): Int {
-    val height = contentResolver.queryAssetHeight(contentUri)
-    // If height is not saved to the database
-    if (getMediaType() == MediaType.IMAGE && height != null && height <= 0) {
-      return downloadBitmapAndGet { it.outHeight }
-    }
-    return height ?: throw AssetPropertyNotFoundException("Height")
+    val mediaStoreHeight = contentResolver.queryAssetHeight(contentUri)
+    return mediaStoreToAssetAdapter.transformHeight(mediaStoreHeight, contentUri)
+      ?: throw AssetPropertyNotFoundException("Height")
   }
 
   override suspend fun getWidth(): Int {
-    val width = contentResolver.queryAssetWidth(contentUri)
-    if (getMediaType() == MediaType.IMAGE && width != null && width <= 0) {
-      return downloadBitmapAndGet { it.outWidth }
-    }
-    return width ?: throw AssetPropertyNotFoundException("Width")
+    val mediaStoreWidth = contentResolver.queryAssetWidth(contentUri)
+    return mediaStoreToAssetAdapter.transformWidth(mediaStoreWidth, contentUri)
+      ?: throw AssetPropertyNotFoundException("Width")
   }
 
-  private suspend fun downloadBitmapAndGet(extract: (BitmapFactory.Options) -> Int): Int {
-    val options = BitmapFactory.Options().apply { inJustDecodeBounds = true }
-    val stringAssetUri = contentResolver.queryAssetPath(contentUri)
-    BitmapFactory.decodeFile(stringAssetUri, options)
-    return extract(options)
+  override suspend fun getShape(): Shape? {
+    val width = getWidth()
+    val height = getHeight()
+    return Shape(width, height).takeIf { width > 0 && height > 0 }
   }
 
   override suspend fun getMediaType(): MediaType =
     MediaType.fromContentUri(contentUri)
 
-  override suspend fun getModificationTime(): Long? =
-    contentResolver.queryAssetModificationTime(contentUri)
-      ?.takeIf { it != 0L }
-      ?.toDuration(DurationUnit.SECONDS)
-      ?.inWholeMilliseconds
+  override suspend fun getModificationTime(): Long? {
+    val mediaStoreDateModified = contentResolver.queryAssetDateModified(contentUri)
+    return mediaStoreToAssetAdapter.transformModificationTime(mediaStoreDateModified)
+  }
 
   override suspend fun getUri(): Uri {
     // e.g. storage/emulated/0/Android/data/expo/files/[ROOT_ALBUM]/[ALBUM_NAME]
-    val path = contentResolver.queryAssetPath(contentUri)
-      ?: throw AssetPropertyNotFoundException("Uri")
+    val mediaStoreData = contentResolver.queryAssetData(contentUri)
     // e.g. file:///storage/emulated/0/Android/data/expo/files/[ROOT_ALBUM]/[ALBUM_NAME]
-    val uri = File(path).toUri()
-    return uri
+    return mediaStoreToAssetAdapter.transformUri(mediaStoreData)
+      ?: throw AssetPropertyNotFoundException("Uri")
+  }
+
+  override suspend fun getInfo(): AssetInfo {
+    val mediaStoreItem = contentResolver.queryAssetMediaStoreItem(contentUri)
+      ?: throw AssetPropertyNotFoundException("Info")
+    val mediaType = getMediaType()
+    val height = mediaStoreToAssetAdapter.transformHeight(mediaStoreItem.height, contentUri)
+    val width = mediaStoreToAssetAdapter.transformWidth(mediaStoreItem.width, contentUri)
+    return AssetInfo(
+      id = contentUri,
+      mediaType = mediaType,
+      creationTime = mediaStoreToAssetAdapter.transformCreationTime(mediaStoreItem.dateTaken),
+      modificationTime = mediaStoreToAssetAdapter.transformModificationTime(mediaStoreItem.dateModified),
+      duration = mediaStoreToAssetAdapter.transformDuration(mediaStoreItem.duration),
+      filename = mediaStoreItem.displayName
+        ?: throw AssetPropertyNotFoundException("Filename"),
+      height = height
+        ?: throw AssetPropertyNotFoundException("Height"),
+      width = width
+        ?: throw AssetPropertyNotFoundException("Width"),
+      uri = mediaStoreToAssetAdapter.transformUri(mediaStoreItem.data)
+        ?: throw AssetPropertyNotFoundException("Uri")
+    )
   }
 
   override suspend fun getMimeType(): MimeType {