react-native-audio-api 0.11.0-nightly-b30bac9-20260114 → 0.11.0

package/android/src/main/cpp/audioapi/android/core/AndroidAudioRecorder.cpp

@@ -27,9 +27,7 @@ AndroidAudioRecorder::AndroidAudioRecorder(
     : AudioRecorder(audioEventHandlerRegistry),
       streamSampleRate_(0.0),
       streamChannelCount_(0),
-      streamMaxBufferSizeInFrames_(0) {
-  nativeAudioRecorder_ = jni::make_global(NativeAudioRecorder::create());
-}
+      streamMaxBufferSizeInFrames_(0) {}
 
 /// @brief Destructor ensures that the audio stream and each output type are closed and flushed up remaining data.
 /// TODO: Possibly locks here are not necessary, but we might have an issue with oboe having raw pointer to the
@@ -55,8 +53,6 @@ AndroidAudioRecorder::~AndroidAudioRecorder() {
     }
   }
 
-  nativeAudioRecorder_.release();
-
   if (mStream_) {
     mStream_->requestStop();
     mStream_->close();
@@ -119,7 +115,7 @@ Result<std::string, std::string> AndroidAudioRecorder::start() {
     return Result<std::string, std::string>::Err(streamResult.unwrap_err());
   }
 
-  if (!mStream_ || !nativeAudioRecorder_) {
+  if (!mStream_) {
     return Result<std::string, std::string>::Err("Audio stream is not initialized.");
   }
 
@@ -153,8 +149,6 @@ Result<std::string, std::string> AndroidAudioRecorder::start() {
         "Failed to start stream: " + std::string(oboe::convertToText(result)));
   }
 
-  jni::ThreadScope::WithClassLoader([this]() { nativeAudioRecorder_->start(); });
-
   state_.store(RecorderState::Recording, std::memory_order_release);
   return Result<std::string, std::string>::Ok(std::format("file://{}", filePath_));
 }
@@ -175,13 +169,12 @@ Result<std::tuple<std::string, double, double>, std::string> AndroidAudioRecorde
         "Recorder is not in recording state.");
   }
 
-  if (!mStream_ || !nativeAudioRecorder_) {
+  if (!mStream_) {
     return Result<std::tuple<std::string, double, double>, std::string>::Err(
         "Audio stream is not initialized.");
   }
 
   state_.store(RecorderState::Idle, std::memory_order_release);
-  jni::ThreadScope::WithClassLoader([this]() { nativeAudioRecorder_->stop(); });
   mStream_->requestStop();
 
   if (usesFileOutput()) {

package/android/src/main/cpp/audioapi/android/core/AudioPlayer.cpp

@@ -17,8 +17,6 @@ AudioPlayer::AudioPlayer(
     int channelCount)
     : renderAudio_(renderAudio), sampleRate_(sampleRate), channelCount_(channelCount) {
   isInitialized_ = openAudioStream();
-
-  nativeAudioPlayer_ = jni::make_global(NativeAudioPlayer::create());
 }
 
 bool AudioPlayer::openAudioStream() {
@@ -47,7 +45,6 @@ bool AudioPlayer::openAudioStream() {
 
 bool AudioPlayer::start() {
   if (mStream_) {
-    jni::ThreadScope::WithClassLoader([this]() { nativeAudioPlayer_->start(); });
     auto result = mStream_->requestStart();
     return result == oboe::Result::OK;
   }
@@ -57,7 +54,6 @@ bool AudioPlayer::start() {
 
 void AudioPlayer::stop() {
   if (mStream_) {
-    jni::ThreadScope::WithClassLoader([this]() { nativeAudioPlayer_->stop(); });
     mStream_->requestStop();
   }
 }

package/android/src/main/java/com/swmansion/audioapi/AudioAPIModule.kt

@@ -148,10 +148,11 @@ class AudioAPIModule(
     promise.resolve(MediaSessionManager.getDevicesInfo())
   }
 
-  // New notification system methods
-  override fun registerNotification(
+  // Notification system methods
+  override fun showNotification(
     type: String?,
     key: String?,
+    options: ReadableMap?,
     promise: Promise?,
   ) {
     try {
@@ -163,61 +164,7 @@ class AudioAPIModule(
         return
       }
 
-      MediaSessionManager.registerNotification(type, key)
-
-      val result = Arguments.createMap()
-      result.putBoolean("success", true)
-      promise?.resolve(result)
-    } catch (e: Exception) {
-      val result = Arguments.createMap()
-      result.putBoolean("success", false)
-      result.putString("error", e.message ?: "Unknown error")
-      promise?.resolve(result)
-    }
-  }
-
-  override fun showNotification(
-    key: String?,
-    options: ReadableMap?,
-    promise: Promise?,
-  ) {
-    try {
-      if (key == null) {
-        val result = Arguments.createMap()
-        result.putBoolean("success", false)
-        result.putString("error", "Key is required")
-        promise?.resolve(result)
-        return
-      }
-
-      MediaSessionManager.showNotification(key, options)
-
-      val result = Arguments.createMap()
-      result.putBoolean("success", true)
-      promise?.resolve(result)
-    } catch (e: Exception) {
-      val result = Arguments.createMap()
-      result.putBoolean("success", false)
-      result.putString("error", e.message ?: "Unknown error")
-      promise?.resolve(result)
-    }
-  }
-
-  override fun updateNotification(
-    key: String?,
-    options: ReadableMap?,
-    promise: Promise?,
-  ) {
-    try {
-      if (key == null) {
-        val result = Arguments.createMap()
-        result.putBoolean("success", false)
-        result.putString("error", "Key is required")
-        promise?.resolve(result)
-        return
-      }
-
-      MediaSessionManager.updateNotification(key, options)
+      MediaSessionManager.showNotification(type, key, options)
 
       val result = Arguments.createMap()
       result.putBoolean("success", true)
@@ -256,32 +203,6 @@ class AudioAPIModule(
     }
   }
 
-  override fun unregisterNotification(
-    key: String?,
-    promise: Promise?,
-  ) {
-    try {
-      if (key == null) {
-        val result = Arguments.createMap()
-        result.putBoolean("success", false)
-        result.putString("error", "Key is required")
-        promise?.resolve(result)
-        return
-      }
-
-      MediaSessionManager.unregisterNotification(key)
-
-      val result = Arguments.createMap()
-      result.putBoolean("success", true)
-      promise?.resolve(result)
-    } catch (e: Exception) {
-      val result = Arguments.createMap()
-      result.putBoolean("success", false)
-      result.putString("error", e.message ?: "Unknown error")
-      promise?.resolve(result)
-    }
-  }
-
   override fun isNotificationActive(
     key: String?,
     promise: Promise?,

package/android/src/main/java/com/swmansion/audioapi/system/CentralizedForegroundService.kt

@@ -6,13 +6,14 @@ import android.app.NotificationManager
 import android.app.Service
 import android.content.Context
 import android.content.Intent
-import android.content.pm.ServiceInfo
 import android.os.Build
 import android.os.IBinder
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import com.swmansion.audioapi.system.MediaSessionManager.CHANNEL_ID
 import com.swmansion.audioapi.system.notification.NotificationRegistry
+import com.swmansion.audioapi.system.notification.PlaybackNotification
+import com.swmansion.audioapi.system.notification.RecordingNotification
 
 /**
  * Centralized foreground service that can be used by any component that needs foreground capabilities.
@@ -20,7 +21,6 @@ import com.swmansion.audioapi.system.notification.NotificationRegistry
 class CentralizedForegroundService : Service() {
   companion object {
     private const val TAG = "CentralizedForegroundService"
-    private const val NOTIFICATION_ID = 100
     const val ACTION_START = "START_FOREGROUND"
     const val ACTION_STOP = "STOP_FOREGROUND"
   }
@@ -49,21 +49,19 @@ class CentralizedForegroundService : Service() {
     try {
       createNotificationChannelIfNeeded()
 
-      // Try to use an existing notification first
+      // Get the first available notification
       val existingNotification = findExistingNotification()
-      val (notificationId, notification) =
-        if (existingNotification != null) {
-          existingNotification
-        } else {
-          // Fallback to default service notification
-          NOTIFICATION_ID to createServiceNotification()
-        }
+      if (existingNotification == null) {
+        Log.w(TAG, "No notification available to start foreground service")
+        return
+      }
+
+      val (notificationId, notification) = existingNotification
 
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
         startForeground(
           notificationId,
           notification,
-          ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK,
         )
       } else {
         startForeground(notificationId, notification)
@@ -76,31 +74,18 @@ class CentralizedForegroundService : Service() {
   }
 
   private fun findExistingNotification(): Pair<Int, Notification>? {
-    // Check for recording notification first (priority)
-    NotificationRegistry.getBuiltNotification(101)?.let {
-      return 101 to it
+    // Check for playback notification first (priority)
+    NotificationRegistry.getBuiltNotification(PlaybackNotification.ID)?.let {
+      return PlaybackNotification.ID to it
     }
 
-    // Check for playback notification
-    NotificationRegistry.getBuiltNotification(100)?.let {
-      return 100 to it
+    NotificationRegistry.getBuiltNotification(RecordingNotification.ID)?.let {
+      return RecordingNotification.ID to it
     }
 
     return null
   }
 
-  private fun createServiceNotification(): Notification =
-    NotificationCompat
-      .Builder(this, CHANNEL_ID)
-      .setContentTitle("Audio Service")
-      .setContentText("Audio processing in progress")
-      .setSmallIcon(android.R.drawable.ic_btn_speak_now)
-      .setPriority(NotificationCompat.PRIORITY_LOW)
-      .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-      .setOngoing(true)
-      .setAutoCancel(false)
-      .build()
-
   private fun createNotificationChannelIfNeeded() {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
       val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager

package/android/src/main/java/com/swmansion/audioapi/system/ForegroundServiceManager.kt

@@ -4,6 +4,7 @@ import android.content.Intent
 import android.os.Build
 import android.util.Log
 import com.facebook.react.bridge.ReactApplicationContext
+import com.swmansion.audioapi.system.notification.BaseNotification
 import java.lang.ref.WeakReference
 
 /**
@@ -14,7 +15,7 @@ object ForegroundServiceManager {
   private const val TAG = "ForegroundServiceManager"
 
   private lateinit var reactContext: WeakReference<ReactApplicationContext>
-  private val subscribers = mutableSetOf<String>()
+  private val subscribers = mutableSetOf<BaseNotification>()
   private var isServiceRunning = false
 
   fun initialize(reactContext: WeakReference<ReactApplicationContext>) {
@@ -23,24 +24,24 @@ object ForegroundServiceManager {
 
   /**
    * Subscribe to foreground service. Service will start if not already running.
-   * @param subscriberId Unique identifier for the subscriber
+   * @param subscriber Unique identifier for the subscriber
    */
   @Synchronized
-  fun subscribe(subscriberId: String) {
-    if (subscribers.add(subscriberId)) {
-      Log.d(TAG, "Subscriber added: $subscriberId (total: ${subscribers.size})")
+  fun subscribe(subscriber: BaseNotification) {
+    if (subscribers.add(subscriber)) {
+      Log.d(TAG, "Subscriber added: $subscriber (total: ${subscribers.size})")
       startServiceIfNeeded()
     }
   }
 
   /**
    * Unsubscribe from foreground service. Service will stop if no more subscribers.
-   * @param subscriberId Unique identifier for the subscriber
+   * @param subscriber Unique identifier for the subscriber
    */
   @Synchronized
-  fun unsubscribe(subscriberId: String) {
-    if (subscribers.remove(subscriberId)) {
-      Log.d(TAG, "Subscriber removed: $subscriberId (total: ${subscribers.size})")
+  fun unsubscribe(subscriber: BaseNotification) {
+    if (subscribers.remove(subscriber)) {
+      Log.d(TAG, "Subscriber removed: $subscriber (total: ${subscribers.size})")
       stopServiceIfNotNeeded()
     }
   }

package/android/src/main/java/com/swmansion/audioapi/system/MediaSessionManager.kt

@@ -10,6 +10,7 @@ import android.media.AudioDeviceInfo
 import android.media.AudioManager
 import android.os.Build
 import androidx.annotation.RequiresApi
+import androidx.annotation.RequiresPermission
 import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
@@ -23,22 +24,17 @@ import com.swmansion.audioapi.system.PermissionRequestListener.Companion.RECORDI
 import com.swmansion.audioapi.system.notification.NotificationRegistry
 import com.swmansion.audioapi.system.notification.PlaybackNotification
 import com.swmansion.audioapi.system.notification.PlaybackNotificationReceiver
-import com.swmansion.audioapi.system.notification.RecordingNotification
-import com.swmansion.audioapi.system.notification.RecordingNotificationReceiver
-import com.swmansion.audioapi.system.notification.SimpleNotification
 import java.lang.ref.WeakReference
 
 object MediaSessionManager {
   private lateinit var audioAPIModule: WeakReference<AudioAPIModule>
   private lateinit var reactContext: WeakReference<ReactApplicationContext>
-  const val NOTIFICATION_ID = 100
   const val CHANNEL_ID = "react-native-audio-api"
 
   private lateinit var audioManager: AudioManager
   private lateinit var audioFocusListener: AudioFocusListener
   private lateinit var volumeChangeListener: VolumeChangeListener
   private lateinit var playbackNotificationReceiver: PlaybackNotificationReceiver
-  private lateinit var recordingNotificationReceiver: RecordingNotificationReceiver
 
   // New notification system
   private lateinit var notificationRegistry: NotificationRegistry
@@ -64,6 +60,10 @@ object MediaSessionManager {
 
     // Register PlaybackNotificationReceiver
     val playbackFilter = IntentFilter(PlaybackNotificationReceiver.ACTION_NOTIFICATION_DISMISSED)
+    playbackFilter.addAction(PlaybackNotification.MEDIA_BUTTON)
+    playbackFilter.addAction(PlaybackNotificationReceiver.ACTION_SKIP_FORWARD)
+    playbackFilter.addAction(PlaybackNotificationReceiver.ACTION_SKIP_BACKWARD)
+
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
       this.reactContext.get()!!.registerReceiver(playbackNotificationReceiver, playbackFilter, Context.RECEIVER_NOT_EXPORTED)
     } else {
@@ -75,29 +75,12 @@ object MediaSessionManager {
       )
     }
 
-    // Set up RecordingNotificationReceiver
-    RecordingNotificationReceiver.setAudioAPIModule(audioAPIModule.get())
-    this.recordingNotificationReceiver = RecordingNotificationReceiver()
-
-    // Register RecordingNotificationReceiver
-    val recordingFilter = IntentFilter(RecordingNotificationReceiver.ACTION_NOTIFICATION_DISMISSED)
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-      this.reactContext.get()!!.registerReceiver(recordingNotificationReceiver, recordingFilter, Context.RECEIVER_NOT_EXPORTED)
-    } else {
-      ContextCompat.registerReceiver(
-        this.reactContext.get()!!,
-        recordingNotificationReceiver,
-        recordingFilter,
-        ContextCompat.RECEIVER_NOT_EXPORTED,
-      )
-    }
-
     this.audioFocusListener =
       AudioFocusListener(WeakReference(this.audioManager), this.audioAPIModule)
     this.volumeChangeListener = VolumeChangeListener(WeakReference(this.audioManager), this.audioAPIModule)
 
     // Initialize new notification system
-    this.notificationRegistry = NotificationRegistry(this.reactContext)
+    this.notificationRegistry = NotificationRegistry(this.reactContext, this.audioAPIModule)
   }
 
   fun getDevicePreferredSampleRate(): Double {
@@ -263,43 +246,19 @@ object MediaSessionManager {
       else -> "Other (${device.type})"
     }
 
-  // New notification system methods
-  fun registerNotification(
-    type: String,
-    key: String,
-  ) {
-    val notification =
-      when (type) {
-        "simple" -> SimpleNotification(reactContext)
-        "playback" -> PlaybackNotification(reactContext, audioAPIModule, 100, "audio_playback")
-        "recording" -> RecordingNotification(reactContext, audioAPIModule, 101, "audio_recording23")
-        else -> throw IllegalArgumentException("Unknown notification type: $type")
-      }
-
-    notificationRegistry.registerNotification(key, notification)
-  }
-
+  // Notification system methods
+  @RequiresPermission(Manifest.permission.POST_NOTIFICATIONS)
   fun showNotification(
+    type: String,
     key: String,
     options: ReadableMap?,
   ) {
-    notificationRegistry.showNotification(key, options)
-  }
-
-  fun updateNotification(
-    key: String,
-    options: ReadableMap?,
-  ) {
-    notificationRegistry.updateNotification(key, options)
+    notificationRegistry.showNotification(key, type, options)
   }
 
   fun hideNotification(key: String) {
     notificationRegistry.hideNotification(key)
   }
 
-  fun unregisterNotification(key: String) {
-    notificationRegistry.unregisterNotification(key)
-  }
-
   fun isNotificationActive(key: String): Boolean = notificationRegistry.isNotificationActive(key)
 }

package/android/src/main/java/com/swmansion/audioapi/system/notification/BaseNotification.kt

@@ -10,28 +10,20 @@ import com.facebook.react.bridge.ReadableMap
  */
 interface BaseNotification {
   /**
-   * Initialize the notification with the provided options.
-   * This method should create the notification and prepare it for display.
+   * Show or update the notification with the provided options.
+   * This method should create/update the notification and prepare it for display.
+   * It handles both initial display and updates.
    *
    * @param options Configuration options from JavaScript side
    * @return The built Notification ready to be shown
    */
-  fun init(options: ReadableMap?): Notification
+  fun show(options: ReadableMap?): Notification
 
   /**
-   * Update the notification with new options.
-   * This method should rebuild the notification with updated data.
-   *
-   * @param options New configuration options from JavaScript side
-   * @return The updated Notification ready to be shown
-   */
-  fun update(options: ReadableMap?): Notification
-
-  /**
-   * Reset the notification to its initial state.
+   * Hide the notification and cleanup resources.
    * This should clear any stored data and stop any ongoing processes.
    */
-  fun reset()
+  fun hide()
 
   /**
    * Get the unique ID for this notification.