expo-audio 0.3.3 → 0.3.4

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 0.3.4 — 2025-01-19
+
+### 💡 Others
+
+- [Android] Add checks to methods that will throw without permissions being granted. ([#33986](https://github.com/expo/expo/pull/33986) by [@alanjhughes](https://github.com/alanjhughes))
+
 ## 0.3.3 — 2025-01-10
 
 ### 🎉 New features

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'expo.modules.audio'
-version = '0.3.3'
+version = '0.3.4'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,7 +14,7 @@ android {
   namespace "expo.modules.audio"
   defaultConfig {
     versionCode 1
-    versionName "0.3.3"
+    versionName "0.3.4"
   }
 
   compileOptions {

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

@@ -325,6 +325,7 @@ class AudioModule : Module() {
       }
 
       AsyncFunction("prepareToRecordAsync") { ref: AudioRecorder, options: RecordingOptions? ->
+        checkRecordingPermission()
         ref.prepareRecording(options)
       }
 
@@ -344,7 +345,6 @@ class AudioModule : Module() {
       }
 
       Function("getStatus") { ref: AudioRecorder ->
-        checkRecordingPermission()
         ref.getAudioRecorderStatus()
       }
 

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

@@ -1,6 +1,8 @@
 package expo.modules.audio
 
+import android.Manifest
 import android.content.Context
+import android.content.pm.PackageManager
 import android.media.AudioDeviceInfo
 import android.media.AudioManager
 import android.media.MediaRecorder
@@ -11,6 +13,7 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.os.SystemClock
+import androidx.core.content.ContextCompat
 import expo.modules.kotlin.AppContext
 import expo.modules.kotlin.sharedobjects.SharedObject
 import java.io.File
@@ -33,7 +36,7 @@ class AudioRecorder(
   private var isPrepared = false
   private var shouldCreateRecorder = false
 
-  var recorder = createRecorder(options)
+  private var recorder = createRecorder(options)
   val id = UUID.randomUUID().toString()
   var uri: String? = null
   var uptime = 0L
@@ -106,8 +109,11 @@ class AudioRecorder(
     }
 
   private fun setRecordingOptions(recorder: MediaRecorder, options: RecordingOptions) {
+    if (!hasRecordingPermissions()) {
+      return
+    }
     with(recorder) {
-      setAudioSource(MediaRecorder.AudioSource.DEFAULT)
+      setAudioSource(MediaRecorder.AudioSource.MIC)
       if (options.outputFormat != null) {
         setOutputFormat(options.outputFormat.toMediaOutputFormat())
       } else {
@@ -153,14 +159,23 @@ class AudioRecorder(
     recorder.release()
   }
 
-  fun getAudioRecorderStatus() = Bundle().apply {
-    putBoolean("canRecord", isPrepared)
-    putBoolean("isRecording", isRecording)
-    putLong("durationMillis", getAudioRecorderDurationMillis())
-    if (meteringEnabled) {
-      putInt("metering", getAudioRecorderLevels())
+  fun getAudioRecorderStatus() = if (hasRecordingPermissions()) {
+    Bundle().apply {
+      putBoolean("canRecord", isPrepared)
+      putBoolean("isRecording", isRecording)
+      putLong("durationMillis", getAudioRecorderDurationMillis())
+      if (meteringEnabled) {
+        putInt("metering", getAudioRecorderLevels())
+      }
+      putString("url", uri)
+    }
+  } else {
+    Bundle().apply {
+      putBoolean("canRecord", false)
+      putBoolean("isRecording", false)
+      putLong("durationMillis", 0)
+      putString("url", null)
     }
-    putString("url", uri)
   }
 
   private fun getAudioRecorderDurationMillis(): Long {
@@ -246,6 +261,9 @@ class AudioRecorder(
     return getMapFromDeviceInfo(deviceInfo)
   }
 
+  private fun hasRecordingPermissions() =
+    ContextCompat.checkSelfPermission(context, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED
+
   fun getAvailableInputs(audioManager: AudioManager) =
     audioManager.getDevices(AudioManager.GET_DEVICES_INPUTS).mapNotNull { deviceInfo ->
       val type = deviceInfo.type

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

@@ -6,7 +6,7 @@ import java.io.File
 import java.io.IOException
 
 fun ensureDirExists(dir: File): File {
-  if (!(dir.isDirectory() || dir.mkdirs())) {
+  if (!(dir.isDirectory || dir.mkdirs())) {
     throw IOException("Couldn't create directory '$dir'")
   }
   return dir
@@ -22,7 +22,7 @@ fun getMapFromDeviceInfo(deviceInfo: AudioDeviceInfo): Bundle {
     AudioDeviceInfo.TYPE_WIRED_HEADSET -> "MicrophoneWired"
     else -> "Unknown device type"
   }
-  map.putString("name", deviceInfo.getProductName().toString())
+  map.putString("name", deviceInfo.productName.toString())
   map.putString("type", type)
   map.putString("uid", deviceInfo.id.toString())
   return map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-audio",
   "title": "Expo Audio",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "A cross-platform audio library for React Native and Expo apps.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -40,5 +40,5 @@
     "react": "*",
     "react-native": "*"
   },
-  "gitHead": "986a4689b91f3efc527f7178a320b987c0005842"
+  "gitHead": "0a0c6d35a691fc59c0d94675d159ac9e3dfd6f26"
 }