expo-audio 0.4.4 → 0.4.5

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 0.4.5 — 2025-05-08
+
+### 🐛 Bug fixes
+
+- [Android] Correctly handle recording URL's and local assets in production. ([#36737](https://github.com/expo/expo/pull/36737) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 0.4.4 — 2025-04-30
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -4,13 +4,13 @@ plugins {
 }
 
 group = 'expo.modules.audio'
-version = '0.4.4'
+version = '0.4.5'
 
 android {
   namespace "expo.modules.audio"
   defaultConfig {
     versionCode 1
-    versionName "0.4.4"
+    versionName "0.4.5"
   }
 
   compileOptions {

package/android/src/main/java/expo/modules/audio/AudioModule.kt

@@ -1,6 +1,7 @@
 package expo.modules.audio
 
 import android.Manifest
+import android.content.ContentResolver
 import android.content.Context
 import android.content.pm.PackageManager
 import android.media.AudioAttributes
@@ -10,6 +11,7 @@ import android.net.Uri
 import android.os.Build
 import android.util.Log
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 import androidx.media3.common.C.CONTENT_TYPE_DASH
 import androidx.media3.common.C.CONTENT_TYPE_HLS
 import androidx.media3.common.C.CONTENT_TYPE_OTHER
@@ -37,7 +39,6 @@ import kotlinx.coroutines.runBlocking
 import okhttp3.OkHttpClient
 import java.io.File
 import kotlin.math.min
-import androidx.core.net.toUri
 
 @androidx.annotation.OptIn(androidx.media3.common.util.UnstableApi::class)
 class AudioModule : Module() {
@@ -401,7 +402,9 @@ class AudioModule : Module() {
       }
 
       Property("uri") { ref ->
-        ref.filePath
+        ref.filePath?.let {
+          Uri.fromFile(File(it)).toString()
+        } ?: ""
       }
 
       Property("isRecording") { ref ->
@@ -456,35 +459,44 @@ class AudioModule : Module() {
     }
   }
 
-  private fun createMediaItem(source: AudioSource?): MediaSource? = source?.uri?.let { uri ->
-    val factory = createDataSourceFactory(source)
-    val sourceUri = if (Util.isLocalFileUri(uri.toUri())) {
-      Uri.fromFile(File(source.uri))
-    } else {
-      source.uri.toUri()
+  private fun createMediaItem(source: AudioSource?): MediaSource? = source?.uri?.let { uriString ->
+    val uri = uriString.toUri()
+    val mediaItem = when (uri.scheme) {
+      null -> MediaItem.fromUri(getRawResourceURI(uriString))
+      else -> MediaItem.fromUri(uri)
     }
-    val item = MediaItem.fromUri(sourceUri)
-    buildMediaSourceFactory(factory, item)
-  }
 
-  private fun createDataSourceFactory(audioSource: AudioSource): DataSource.Factory {
-    val uri = if (Util.isLocalFileUri(Uri.parse(audioSource.uri))) {
-      Uri.fromFile(File(audioSource.uri))
-    } else {
-      Uri.parse(audioSource.uri)
+    val factory = when (uri.scheme) {
+      "http", "https" -> httpDataSourceFactory(source.headers)
+      else -> DefaultDataSource.Factory(context)
     }
-    val isLocal = Util.isLocalFileUri(uri)
-    return if (isLocal) {
-      DefaultDataSource.Factory(context)
-    } else {
-      OkHttpDataSource.Factory(httpClient).apply {
-        audioSource.headers?.let { headers ->
-          setDefaultRequestProperties(headers)
-        }
+    return buildMediaSourceFactory(factory, mediaItem)
+  }
+
+  private fun httpDataSourceFactory(headers: Map<String, String>?): DataSource.Factory {
+    return OkHttpDataSource.Factory(httpClient).apply {
+      headers?.let { headers ->
+        setDefaultRequestProperties(headers)
       }
     }
   }
 
+  private fun getRawResourceURI(file: String): Uri {
+    val resId = context.resources.getIdentifier(file, "raw", context.packageName)
+
+    return when {
+      resId == 0 ->
+        Uri.fromFile(File(file))
+      else ->
+        Uri.Builder()
+          .scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
+          .authority(context.packageName)
+          .appendPath("raw")
+          .appendPath(file)
+          .build()
+    }
+  }
+
   private fun updatePlaySoundThroughEarpiece(playThroughEarpiece: Boolean) {
     audioManager.mode = if (playThroughEarpiece) AudioManager.MODE_IN_COMMUNICATION else AudioManager.MODE_NORMAL
     audioManager.setSpeakerphoneOn(!playThroughEarpiece)

package/android/src/main/java/expo/modules/audio/AudioRecorder.kt

@@ -142,9 +142,10 @@ class AudioRecorder(
 
       val filename = "recording-${UUID.randomUUID()}${options.extension}"
       try {
-        val directory = File(context.cacheDir.toString() + File.separator + "Audio")
+        val directory = File(context.cacheDir, "Audio")
         ensureDirExists(directory)
-        filePath = "$directory${File.separator}$filename"
+        val file = File(directory, filename)
+        filePath = file.absolutePath
       } catch (e: IOException) {
         // This only occurs in the case that the scoped path is not in this experience's scope,
         // which is never true.
@@ -169,7 +170,10 @@ class AudioRecorder(
       getAudioRecorderLevels()?.let {
         putInt("metering", it)
       }
-      putString("url", filePath)
+      filePath?.let {
+        val path = Uri.fromFile(File(it)).toString()
+        putString("url", path)
+      }
     }
   } else {
     Bundle().apply {

package/expo-module.config.json

@@ -4,12 +4,6 @@
     "modules": ["AudioModule"]
   },
   "android": {
-    "modules": ["expo.modules.audio.AudioModule"],
-    "publication": {
-      "groupId": "expo.modules.audio",
-      "artifactId": "expo.modules.audio",
-      "version": "0.4.4",
-      "repository": "local-maven-repo"
-    }
+    "modules": ["expo.modules.audio.AudioModule"]
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-audio",
   "title": "Expo Audio",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "A cross-platform audio library for React Native and Expo apps.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -33,12 +33,12 @@
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "expo-module-scripts": "^4.1.6"
+    "expo-module-scripts": "^4.1.7"
   },
   "peerDependencies": {
     "expo": "*",
     "react": "*",
     "react-native": "*"
   },
-  "gitHead": "84355076bc31a356aa3d23257f387f221885f53d"
+  "gitHead": "49c9d53cf0a9fc8179d1c8f5268beadd141f70ca"
 }

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4-sources.jar.md5

@@ -1 +0,0 @@
-2fb5759d28c945fe08c1530cb736aaf4

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4-sources.jar.sha1

@@ -1 +0,0 @@
-f759ea485190b58c8e59734d263dccab32dd7110

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4-sources.jar.sha256

@@ -1 +0,0 @@
-d9806afca725f0656507326bc8b0d7db75e75ccd2ce4e1ea626209cef8909756

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4-sources.jar.sha512

@@ -1 +0,0 @@
-62186f8682284e739c2bad57001ab13df39e5aeaf2ba3de1414ab6022706b6a2aa27d885e0e3461ec8d9046432a99f7768aaf543254a813e64857e20afb8f92d

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4.aar.md5

@@ -1 +0,0 @@
-f9e65a4d3c93f2b651a29f6d1c9a25e1

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4.aar.sha1

@@ -1 +0,0 @@
-afba18ce78ec8af3fd7e1f057c7af8de0409ec37

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4.aar.sha256

@@ -1 +0,0 @@
-b454e054c8b967eba2af8fa695eb3e288a5ab03855945a5b904267a81e814e91

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4.aar.sha512

@@ -1 +0,0 @@
-a0b3065f75bfe4f2b39cb9ebd0d8c1852643f94409f94560c2b33f033fc3d4f07da0406bbe2a277ac6f110fe7e2de292d07695487513234a82ad102e015802e9

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4.module

@@ -1,129 +0,0 @@
-{
-  "formatVersion": "1.1",
-  "component": {
-    "group": "expo.modules.audio",
-    "module": "expo.modules.audio",
-    "version": "0.4.4",
-    "attributes": {
-      "org.gradle.status": "release"
-    }
-  },
-  "createdBy": {
-    "gradle": {
-      "version": "8.13"
-    }
-  },
-  "variants": [
-    {
-      "name": "releaseVariantReleaseApiPublication",
-      "attributes": {
-        "org.gradle.category": "library",
-        "org.gradle.dependency.bundling": "external",
-        "org.gradle.libraryelements": "aar",
-        "org.gradle.usage": "java-api"
-      },
-      "files": [
-        {
-          "name": "expo.modules.audio-0.4.4.aar",
-          "url": "expo.modules.audio-0.4.4.aar",
-          "size": 184916,
-          "sha512": "a0b3065f75bfe4f2b39cb9ebd0d8c1852643f94409f94560c2b33f033fc3d4f07da0406bbe2a277ac6f110fe7e2de292d07695487513234a82ad102e015802e9",
-          "sha256": "b454e054c8b967eba2af8fa695eb3e288a5ab03855945a5b904267a81e814e91",
-          "sha1": "afba18ce78ec8af3fd7e1f057c7af8de0409ec37",
-          "md5": "f9e65a4d3c93f2b651a29f6d1c9a25e1"
-        }
-      ]
-    },
-    {
-      "name": "releaseVariantReleaseRuntimePublication",
-      "attributes": {
-        "org.gradle.category": "library",
-        "org.gradle.dependency.bundling": "external",
-        "org.gradle.libraryelements": "aar",
-        "org.gradle.usage": "java-runtime"
-      },
-      "dependencies": [
-        {
-          "group": "org.jetbrains.kotlin",
-          "module": "kotlin-stdlib-jdk7",
-          "version": {
-            "requires": "2.0.21"
-          }
-        },
-        {
-          "group": "androidx.appcompat",
-          "module": "appcompat",
-          "version": {
-            "requires": "1.7.0"
-          }
-        },
-        {
-          "group": "androidx.media3",
-          "module": "media3-exoplayer",
-          "version": {
-            "requires": "1.4.0"
-          }
-        },
-        {
-          "group": "androidx.media3",
-          "module": "media3-exoplayer-dash",
-          "version": {
-            "requires": "1.4.0"
-          }
-        },
-        {
-          "group": "androidx.media3",
-          "module": "media3-datasource-okhttp",
-          "version": {
-            "requires": "1.4.0"
-          }
-        },
-        {
-          "group": "androidx.media3",
-          "module": "media3-exoplayer-hls",
-          "version": {
-            "requires": "1.4.0"
-          }
-        },
-        {
-          "group": "androidx.media3",
-          "module": "media3-exoplayer-smoothstreaming",
-          "version": {
-            "requires": "1.4.0"
-          }
-        }
-      ],
-      "files": [
-        {
-          "name": "expo.modules.audio-0.4.4.aar",
-          "url": "expo.modules.audio-0.4.4.aar",
-          "size": 184916,
-          "sha512": "a0b3065f75bfe4f2b39cb9ebd0d8c1852643f94409f94560c2b33f033fc3d4f07da0406bbe2a277ac6f110fe7e2de292d07695487513234a82ad102e015802e9",
-          "sha256": "b454e054c8b967eba2af8fa695eb3e288a5ab03855945a5b904267a81e814e91",
-          "sha1": "afba18ce78ec8af3fd7e1f057c7af8de0409ec37",
-          "md5": "f9e65a4d3c93f2b651a29f6d1c9a25e1"
-        }
-      ]
-    },
-    {
-      "name": "releaseVariantReleaseSourcePublication",
-      "attributes": {
-        "org.gradle.category": "documentation",
-        "org.gradle.dependency.bundling": "external",
-        "org.gradle.docstype": "sources",
-        "org.gradle.usage": "java-runtime"
-      },
-      "files": [
-        {
-          "name": "expo.modules.audio-0.4.4-sources.jar",
-          "url": "expo.modules.audio-0.4.4-sources.jar",
-          "size": 11770,
-          "sha512": "62186f8682284e739c2bad57001ab13df39e5aeaf2ba3de1414ab6022706b6a2aa27d885e0e3461ec8d9046432a99f7768aaf543254a813e64857e20afb8f92d",
-          "sha256": "d9806afca725f0656507326bc8b0d7db75e75ccd2ce4e1ea626209cef8909756",
-          "sha1": "f759ea485190b58c8e59734d263dccab32dd7110",
-          "md5": "2fb5759d28c945fe08c1530cb736aaf4"
-        }
-      ]
-    }
-  ]
-}

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4.module.md5

@@ -1 +0,0 @@
-f94d47ac42774df01358848579cf2c1b

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4.module.sha1

@@ -1 +0,0 @@
-2c89ab78c80717e07f02d5276dfc693af1ccf71f

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4.module.sha256

@@ -1 +0,0 @@
-0c1e5728a99eb34cfa960cef3473b89d445653a6c9eadc45bf3753b58bb75d45

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4.module.sha512

@@ -1 +0,0 @@
-8c67acb6841487e2ab929ebb5a3cbafcc1c56e76501803b3ecbd1257f4650f5fb9080a5d6037b34d44791db4526a7b534d811ee2932bc59efca637692540f2e8

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4.pom

@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <!-- This module was also published with a richer model, Gradle metadata,  -->
-  <!-- which should be used instead. Do not delete the following line which  -->
-  <!-- is to indicate to Gradle or any Gradle module metadata file consumer  -->
-  <!-- that they should prefer consuming it instead. -->
-  <!-- do_not_remove: published-with-gradle-metadata -->
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>expo.modules.audio</groupId>
-  <artifactId>expo.modules.audio</artifactId>
-  <version>0.4.4</version>
-  <packaging>aar</packaging>
-  <name>expo.modules.audio</name>
-  <url>https://github.com/expo/expo</url>
-  <licenses>
-    <license>
-      <name>MIT License</name>
-      <url>https://github.com/expo/expo/blob/main/LICENSE</url>
-    </license>
-  </licenses>
-  <scm>
-    <connection>https://github.com/expo/expo.git</connection>
-    <developerConnection>https://github.com/expo/expo.git</developerConnection>
-    <url>https://github.com/expo/expo</url>
-  </scm>
-  <dependencies>
-    <dependency>
-      <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-stdlib-jdk7</artifactId>
-      <version>2.0.21</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>androidx.appcompat</groupId>
-      <artifactId>appcompat</artifactId>
-      <version>1.7.0</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>androidx.media3</groupId>
-      <artifactId>media3-exoplayer</artifactId>
-      <version>1.4.0</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>androidx.media3</groupId>
-      <artifactId>media3-exoplayer-dash</artifactId>
-      <version>1.4.0</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>androidx.media3</groupId>
-      <artifactId>media3-datasource-okhttp</artifactId>
-      <version>1.4.0</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>androidx.media3</groupId>
-      <artifactId>media3-exoplayer-hls</artifactId>
-      <version>1.4.0</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>androidx.media3</groupId>
-      <artifactId>media3-exoplayer-smoothstreaming</artifactId>
-      <version>1.4.0</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-</project>

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4.pom.md5

@@ -1 +0,0 @@
-5dbdfa81a6a02c54c1fe14fa45b83983

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4.pom.sha1

@@ -1 +0,0 @@
-63e829bffdfd96f631819f25f1e816b9c49bbd17

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4.pom.sha256

@@ -1 +0,0 @@
-75dfa1dfcf21b40b838bb271f7c25d1a2c6f91e1ea47afa9fadecfd20b2df6bf

package/local-maven-repo/expo/modules/audio/expo.modules.audio/0.4.4/expo.modules.audio-0.4.4.pom.sha512

@@ -1 +0,0 @@
-341004398d6e8308047b53ca98986843e40be231583cc7a29bf3e1dec8853aabc01b1e006b704ec110612fc0cd6e850cd4613f79a59372d3e50d280e70f09b8d

package/local-maven-repo/expo/modules/audio/expo.modules.audio/maven-metadata.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metadata>
-  <groupId>expo.modules.audio</groupId>
-  <artifactId>expo.modules.audio</artifactId>
-  <versioning>
-    <latest>0.4.4</latest>
-    <release>0.4.4</release>
-    <versions>
-      <version>0.4.4</version>
-    </versions>
-    <lastUpdated>20250430211501</lastUpdated>
-  </versioning>
-</metadata>

package/local-maven-repo/expo/modules/audio/expo.modules.audio/maven-metadata.xml.md5

@@ -1 +0,0 @@
-cbf2f3d9f568453dfe1ac816538cee99

package/local-maven-repo/expo/modules/audio/expo.modules.audio/maven-metadata.xml.sha1

@@ -1 +0,0 @@
-c148945b4964211fe7d2be5ff555e92a0bff8e2b

package/local-maven-repo/expo/modules/audio/expo.modules.audio/maven-metadata.xml.sha256

@@ -1 +0,0 @@
-ef01465e31771ebbdad28ba7a8820ab67368306b1170379ae399e9be6733b621

package/local-maven-repo/expo/modules/audio/expo.modules.audio/maven-metadata.xml.sha512

@@ -1 +0,0 @@
-da22bdbcb1f3d95a6f9657f9adc79dc0d7914d41615b44787f40d81d8b60d7460ae1456b3d94bbd7c3aa5b7afbdd1b6a84ba633df565496c495d615e50119fd8