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

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

@@ -2,6 +2,7 @@ package com.swmansion.audioapi.system.notification
 
 import android.app.Notification
 import android.util.Log
+import androidx.annotation.RequiresPermission
 import androidx.core.app.NotificationManagerCompat
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReadableMap
@@ -10,9 +11,11 @@ import java.lang.ref.WeakReference
 
 /**
  * Central notification registry that manages multiple notification instances.
+ * Automatically handles foreground service lifecycle based on active notifications.
  */
 class NotificationRegistry(
   private val reactContext: WeakReference<ReactApplicationContext>,
+  private val audioAPIModule: WeakReference<com.swmansion.audioapi.AudioAPIModule>,
 ) {
   companion object {
     private const val TAG = "NotificationRegistry"
@@ -27,29 +30,26 @@ class NotificationRegistry(
   private val activeNotifications = mutableMapOf<String, Boolean>()
 
   /**
-   * Register a new notification instance.
-   *
-   * @param key Unique identifier for this notification
-   * @param notification The notification instance to register
-   */
-  fun registerNotification(
-    key: String,
-    notification: BaseNotification,
-  ) {
-    notifications[key] = notification
-    Log.d(TAG, "Registered notification: $key")
-  }
-
-  /**
-   * Initialize and show a notification.
+   * Show or update a notification.
+   * Automatically creates the notification instance on first call.
+   * If notification is not visible, it will be shown and subscribed to foreground service.
+   * If already visible, it will be updated.
    *
    * @param key The unique identifier of the notification
+   * @param type The type of notification (only used for first creation)
    * @param options Configuration options from JavaScript
    */
+  @RequiresPermission(android.Manifest.permission.POST_NOTIFICATIONS)
   fun showNotification(
     key: String,
+    type: String,
     options: ReadableMap?,
   ) {
+    // Auto-create notification if it doesn't exist
+    if (!notifications.containsKey(key)) {
+      createNotification(type, key)
+    }
+
     val notification = notifications[key]
     if (notification == null) {
       Log.w(TAG, "Notification not found: $key")
@@ -57,85 +57,103 @@ class NotificationRegistry(
     }
 
     try {
-      val builtNotification = notification.init(options)
-      displayNotification(notification.getNotificationId(), builtNotification)
-      activeNotifications[key] = true
+      val wasActive = isNotificationActive(key)
 
-      // Subscribe to foreground service for persistent notifications
-      ForegroundServiceManager.subscribe("notification_$key")
+      // Build/update the notification
+      val builtNotification = notification.show(options)
+      displayNotification(notification.getNotificationId(), builtNotification)
 
-      Log.d(TAG, "Showing notification: $key")
+      // Subscribe to foreground service if not already active
+      if (!wasActive) {
+        ForegroundServiceManager.subscribe(notification)
+        activeNotifications[key] = true
+        Log.d(TAG, "Showing notification: $key (subscribed to foreground service)")
+      } else {
+        Log.d(TAG, "Updating notification: $key")
+      }
     } catch (e: Exception) {
       Log.e(TAG, "Error showing notification $key: ${e.message}", e)
     }
   }
 
   /**
-   * Update an existing notification with new options.
+   * Hide a notification.
    *
    * @param key The unique identifier of the notification
-   * @param options New configuration options from JavaScript
    */
-  fun updateNotification(
-    key: String,
-    options: ReadableMap?,
-  ) {
-    if (!activeNotifications.getOrDefault(key, false)) {
-      Log.w(TAG, "Cannot update inactive notification: $key")
-      return
-    }
-
+  fun hideNotification(key: String) {
     val notification = notifications[key]
     if (notification == null) {
-      Log.w(TAG, "Notification not found: $key")
+      // Silently ignore if notification doesn't exist
       return
     }
 
     try {
-      val builtNotification = notification.update(options)
-      displayNotification(notification.getNotificationId(), builtNotification)
-      Log.d(TAG, "Updated notification: $key")
+      // Only hide if currently active
+      if (activeNotifications.getOrDefault(key, false)) {
+        cancelNotification(notification.getNotificationId())
+        notification.hide()
+        activeNotifications[key] = false
+
+        // Unsubscribe from foreground service
+        ForegroundServiceManager.unsubscribe(notification)
+
+        Log.d(TAG, "Hiding notification: $key (unsubscribed from foreground service)")
+      }
     } catch (e: Exception) {
-      Log.e(TAG, "Error updating notification $key: ${e.message}", e)
+      Log.e(TAG, "Error hiding notification $key: ${e.message}", e)
     }
   }
 
   /**
-   * Hide and reset a notification.
+   * Create a notification instance.
    *
-   * @param key The unique identifier of the notification
+   * @param type The type of notification to create
+   * @param key Unique identifier for this notification
    */
-  fun hideNotification(key: String) {
-    val notification = notifications[key]
-    if (notification == null) {
-      Log.w(TAG, "Notification not found: $key")
-      return
-    }
-
-    try {
-      cancelNotification(notification.getNotificationId())
-      notification.reset()
-      activeNotifications[key] = false
-
-      // Unsubscribe from foreground service
-      ForegroundServiceManager.unsubscribe("notification_$key")
+  private fun createNotification(
+    type: String,
+    key: String,
+  ) {
+    val notification =
+      when (type) {
+        "playback" -> {
+          PlaybackNotification(
+            reactContext,
+            audioAPIModule,
+            PlaybackNotification.ID,
+            "audio_playback",
+          )
+        }
+
+        "recording" -> {
+          RecordingNotification(
+            reactContext,
+            audioAPIModule,
+            RecordingNotification.ID,
+            "audio_recording4",
+          )
+        }
+
+        else -> {
+          throw IllegalArgumentException("Unknown notification type: $type")
+        }
+      }
 
-      Log.d(TAG, "Hiding notification: $key")
-    } catch (e: Exception) {
-      Log.e(TAG, "Error hiding notification $key: ${e.message}", e)
-    }
+    notifications[key] = notification
+    Log.d(TAG, "Created notification: $key (type: $type)")
   }
 
   /**
-   * Unregister and cleanup a notification.
+   * Destroy and cleanup a notification.
    *
    * @param key The unique identifier of the notification
    */
-  fun unregisterNotification(key: String) {
+  fun destroyNotification(key: String) {
     hideNotification(key)
     notifications.remove(key)
     activeNotifications.remove(key)
-    Log.d(TAG, "Unregistered notification: $key")
+    Log.d(TAG, "Destroyed notification: $key")
   }
 
   /**
@@ -165,6 +183,7 @@ class NotificationRegistry(
     Log.d(TAG, "Cleaned up all notifications")
   }
 
+  @RequiresPermission(android.Manifest.permission.POST_NOTIFICATIONS)
   private fun displayNotification(
     id: Int,
     notification: Notification,