expo-notifications 0.28.16 → 1.0.0-canary-20240904-69100c1

package/CHANGELOG.md

@@ -4,61 +4,58 @@
 
 ### 🛠 Breaking changes
 
-### 🎉 New features
-
-### 🐛 Bug fixes
+- Bumped iOS deployment target to 15.1. ([#30840](https://github.com/expo/expo/pull/30840), [#30862](https://github.com/expo/expo/pull/30862) by [@tsapeta](https://github.com/tsapeta))
 
-### 💡 Others
-
-## 0.28.16 — 2024-08-21
+### 🎉 New features
 
 ### 🐛 Bug fixes
 
+- [Android] Take `channelId` into account when presenting notifications. ([#31201](https://github.com/expo/expo/pull/31201) by [@vonovak](https://github.com/vonovak))
+- Add missing `react` and `react-native` peer dependencies for isolated modules. ([#30478](https://github.com/expo/expo/pull/30478) by [@byCedric](https://github.com/byCedric))
+- [Android] Eliminate unsupported types when processing notification intents from onCreate/onNewIntent. ([#30750](https://github.com/expo/expo/pull/30750) by [@douglowder](https://github.com/douglowder))
 - [Android] Fix content.data in scheduled notifications surfaced to JS. ([#31048](https://github.com/expo/expo/pull/31048) by [@douglowder](https://github.com/douglowder))
+- [Android] fix local notifications with null trigger. ([#31157](https://github.com/expo/expo/pull/31157) by [@douglowder](https://github.com/douglowder))
 
-## 0.28.15 — 2024-08-05
-
-### 🐛 Bug fixes
+### 💡 Others
 
-- [Android] Eliminate unsupported types when processing notification intents from onCreate/onNewIntent. ([#30750](https://github.com/expo/expo/pull/30750) by [@douglowder](https://github.com/douglowder))
+- Keep using the legacy event emitter as the module is not fully migrated to Expo Modules API. ([#28946](https://github.com/expo/expo/pull/28946) by [@tsapeta](https://github.com/tsapeta))
 
-## 0.28.14 — 2024-07-30
+## 0.28.14 - 2024-07-30
 
 ### 🐛 Bug fixes
 
 - `useLastNotificationResponse` should have only one effect. ([#30653](https://github.com/expo/expo/pull/30653) by [@douglowder](https://github.com/douglowder))
 
-## 0.28.13 — 2024-07-29
+## 0.28.13 - 2024-07-29
 
 ### 🐛 Bug fixes
 
 - [Android] map Expo and Firebase notifications correctly. ([#30615](https://github.com/expo/expo/pull/30615) by [@douglowder](https://github.com/douglowder))
-- [Android] Apply requested changes from #30615. ([#30658](https://github.com/expo/expo/pull/30615) by [@lukmccall](https://github.com/lukmccall))
 
-## 0.28.12 — 2024-07-25
+## 0.28.12 - 2024-07-25
 
 ### 🐛 Bug fixes
 
 - [Android] Android 11 crash when click foreground notifications. ([#30207](https://github.com/expo/expo/pull/30207) by [@GrinZero](https://github.com/GrinZero))
 - Notification's textInput content would contain `placeholder` instead of the actual user input ([#27479](https://github.com/expo/expo/pull/27479) by [@Victor-FT](https://github.com/Victor-FT))
 
-## 0.28.11 — 2024-07-22
+## 0.28.11 - 2024-07-22
 
 ### 🐛 Bug fixes
 
 - [Android] Fix serialization of vibration pattern. ([#30495](https://github.com/expo/expo/pull/30495) by [@douglowder](https://github.com/douglowder))
 
-## 0.28.10 — 2024-07-15
+## 0.28.10 - 2024-07-15
 
 ### 🐛 Bug fixes
 
 - [Android] fix getLastNotificationResponseAsync. ([#30301](https://github.com/expo/expo/pull/30301) by [@douglowder](https://github.com/douglowder))
 
-## 0.28.9 — 2024-06-12
+## 0.28.9 - 2024-06-12
 
 _This version does not introduce any user-facing changes._
 
-## 0.28.8 — 2024-06-10
+## 0.28.8 - 2024-06-10
 
 ### 🐛 Bug fixes
 
@@ -88,6 +85,8 @@ _This version does not introduce any user-facing changes._
 
 - [Android] Correctly map response in useLastNotificationResponse hook. ([#28938](https://github.com/expo/expo/pull/28938) by [@douglowder](https://github.com/douglowder))
 
+## 0.28.3 — 2024-05-16
+
 ### 💡 Others
 
 - [iOS] Add support for `interruptionLevel`. ([#28921](https://github.com/expo/expo/pull/28921) by [@lukmccall](https://github.com/lukmccall))

package/README.md

@@ -50,7 +50,7 @@ In order to be able to receive push notifications on the device:
 
 ### Configure for Android
 
-In order to be able to receive push notifications on the device ensure that your project is set up for Firebase. For more information on how to do it, see [this guide](https://docs.expo.dev/guides/setup-native-firebase/#bare-workflow-setup).
+In order to be able to receive push notifications on the device ensure that your project is set up for Firebase. For more information on how to do it, see [this guide](https://docs.expo.dev/guides/using-firebase/#install-and-initialize-react-native-firebase).
 
 This module requires permission to subscribe to device boot. It's used to setup the scheduled notifications right after the device (re)starts. The `RECEIVE_BOOT_COMPLETED` permission is added automatically.
 
@@ -825,7 +825,6 @@ An optional object of conforming to the following interface:
     allowCriticalAlerts?: boolean;
     provideAppNotificationSettings?: boolean;
     allowProvisional?: boolean;
-    allowAnnouncements?: boolean;
   }
 }
 ```
@@ -849,7 +848,6 @@ export function requestPermissionsAsync() {
       allowAlert: true,
       allowBadge: true,
       allowSound: true,
-      allowAnnouncements: true,
     },
   });
 }

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '0.28.16'
+version = '0.28.3'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,12 +14,23 @@ android {
   namespace "expo.modules.notifications"
   defaultConfig {
     versionCode 21
-    versionName '0.28.16'
+    versionName '0.28.3'
   }
 
   buildFeatures {
     buildConfig true
   }
+  testOptions {
+    unitTests.all { test ->
+      testLogging {
+        outputs.upToDateWhen { false }
+        events "passed", "failed", "skipped", "standardError"
+        showCauses true
+        showExceptions true
+        showStandardStreams true
+      }
+    }
+  }
 }
 
 dependencies {

package/android/src/main/java/expo/modules/notifications/Exceptions.kt

@@ -7,16 +7,3 @@ class ModuleNotFoundException(moduleClass: KClass<*>) :
   CodedException(message = "$moduleClass module not found")
 
 class NotificationWasAlreadyHandledException(val id: String) : CodedException("Failed to handle notification $id, it has already been handled.")
-
-fun expo.modules.kotlin.Promise.toLegacyPromise(): expo.modules.core.Promise {
-  val newPromise = this
-  return object : expo.modules.core.Promise {
-    override fun resolve(value: Any?) {
-      newPromise.resolve(value)
-    }
-
-    override fun reject(c: String?, m: String?, e: Throwable?) {
-      newPromise.reject(c ?: "unknown", m, e)
-    }
-  }
-}

package/android/src/main/java/expo/modules/notifications/notifications/JSONNotificationContentBuilder.java

@@ -100,7 +100,7 @@ public class JSONNotificationContentBuilder extends NotificationContent.Builder
       // do nothing
     }
 
-    // do not play a default sound only if the value is a valid Uri
+    // play a default sound only if the value is NOT a valid Uri
     return getSound(payload) == null;
   }
 

package/android/src/main/java/expo/modules/notifications/notifications/NotificationSerializer.java

@@ -76,7 +76,10 @@ public class NotificationSerializer {
           // and we copy the data as is
           content.putBundle("data", toBundle(data));
         }
-      } else if(request.getTrigger() instanceof SchedulableNotificationTrigger) {
+      } else if(
+        request.getTrigger() instanceof SchedulableNotificationTrigger ||
+          request.getTrigger() == null
+      ) {
         JSONObject body = request.getContent().getBody();
         if (body != null) {
           // Expo sends notification.body as data.message, and JSON stringifies data.body

package/android/src/main/java/expo/modules/notifications/notifications/debug/DebugLogging.kt

@@ -74,6 +74,7 @@ object DebugLogging {
         notification.notificationRequest.content.subtitle: ${notification.notificationRequest.content.subtitle}
         notification.notificationRequest.content.text: ${notification.notificationRequest.content.text}
         notification.notificationRequest.content.sound: ${notification.notificationRequest.content.sound}
+        notification.notificationRequest.content.channelID: ${notification.notificationRequest.trigger.notificationChannel}
         notification.notificationRequest.content.body: ${notification.notificationRequest.content.body}
         notification.notificationRequest.content.color: ${notification.notificationRequest.content.color}
         notification.notificationRequest.content.vibrationPattern: ${notification.notificationRequest.content.vibrationPattern.contentToString()}

package/android/src/main/java/expo/modules/notifications/notifications/handling/NotificationsHandler.kt

@@ -13,7 +13,6 @@ import expo.modules.notifications.notifications.interfaces.NotificationListener
 import expo.modules.notifications.notifications.interfaces.NotificationManager
 import expo.modules.notifications.notifications.model.Notification
 import expo.modules.notifications.notifications.model.NotificationBehavior
-import expo.modules.notifications.toLegacyPromise
 
 class NotificationBehaviourRecord : Record {
   @Field
@@ -102,7 +101,7 @@ open class NotificationsHandler : Module(), NotificationListener {
     with(behavior) {
       task.handleResponse(
         NotificationBehavior(shouldShowAlert, shouldPlaySound, shouldSetBadge, priority),
-        promise.toLegacyPromise()
+        promise
       )
     }
   }

package/android/src/main/java/expo/modules/notifications/notifications/handling/SingleNotificationHandlerTask.java

@@ -5,7 +5,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.ResultReceiver;
 
-import expo.modules.core.Promise;
+import expo.modules.kotlin.Promise;
 import expo.modules.core.interfaces.services.EventEmitter;
 import expo.modules.notifications.notifications.NotificationSerializer;
 import expo.modules.notifications.notifications.model.Notification;
@@ -98,7 +98,7 @@ public class SingleNotificationHandlerTask {
           protected void onReceiveResult(int resultCode, Bundle resultData) {
             super.onReceiveResult(resultCode, resultData);
             if (resultCode == NotificationsService.SUCCESS_CODE) {
-              promise.resolve(null);
+              promise.resolve();
             } else {
               Exception e = (Exception) resultData.getSerializable(NotificationsService.EXCEPTION_KEY);
               promise.reject("ERR_NOTIFICATION_PRESENTATION_FAILED", "Notification presentation failed.", e);

package/android/src/main/java/expo/modules/notifications/notifications/model/triggers/FirebaseNotificationTrigger.kt

@@ -0,0 +1,43 @@
+package expo.modules.notifications.notifications.model.triggers
+
+import android.os.Build
+import android.os.Parcel
+import android.os.Parcelable
+import androidx.annotation.RequiresApi
+import com.google.firebase.messaging.RemoteMessage
+import expo.modules.notifications.notifications.interfaces.NotificationTrigger
+
+/**
+ * A trigger representing an incoming remote Firebase notification.
+ */
+class FirebaseNotificationTrigger(private val remoteMessage: RemoteMessage) : NotificationTrigger {
+
+  private constructor(parcel: Parcel) : this(
+    parcel.readParcelable(FirebaseNotificationTrigger::class.java.classLoader)
+      ?: throw IllegalArgumentException("RemoteMessage from readParcelable must not be null")
+  )
+
+  fun getRemoteMessage(): RemoteMessage = remoteMessage
+
+  @RequiresApi(api = Build.VERSION_CODES.O)
+  override fun getNotificationChannel(): String? {
+    val channelId = remoteMessage.notification?.channelId ?: remoteMessage.data["channelId"]
+    return channelId ?: super.getNotificationChannel()
+  }
+
+  override fun describeContents(): Int {
+    return 0
+  }
+
+  override fun writeToParcel(dest: Parcel, flags: Int) {
+    dest.writeParcelable(remoteMessage, 0)
+  }
+
+  companion object {
+    @JvmField
+    val CREATOR = object : Parcelable.Creator<FirebaseNotificationTrigger> {
+      override fun createFromParcel(parcel: Parcel) = FirebaseNotificationTrigger(parcel)
+      override fun newArray(size: Int) = arrayOfNulls<FirebaseNotificationTrigger>(size)
+    }
+  }
+}

package/android/src/main/java/expo/modules/notifications/notifications/presentation/builders/ChannelAwareNotificationBuilder.java

@@ -53,19 +53,18 @@ public abstract class ChannelAwareNotificationBuilder extends BaseNotificationBu
       return getFallbackNotificationChannel().getId();
     }
 
-    String channelId = trigger.getNotificationChannel();
-    if (channelId == null) {
+    String requestedChannelId = trigger.getNotificationChannel();
+    if (requestedChannelId == null) {
       return getFallbackNotificationChannel().getId();
     }
 
-    NotificationsChannelManager manager = getNotificationsChannelManager();
-    NotificationChannel channel = manager.getNotificationChannel(channelId);
-    if (channel == null) {
-      Log.e("notifications", String.format("Channel '%s' doesn't exists. Fallback to '%s' channel", channelId, FALLBACK_CHANNEL_ID));
+    NotificationChannel channelForRequestedId = getNotificationsChannelManager().getNotificationChannel(requestedChannelId);
+    if (channelForRequestedId == null) {
+      Log.e("notifications", String.format("Channel '%s' doesn't exists. Fallback to '%s' channel", requestedChannelId, FALLBACK_CHANNEL_ID));
       return getFallbackNotificationChannel().getId();
     }
 
-    return channel.getId();
+    return channelForRequestedId.getId();
   }
 
   @NonNull

package/android/src/main/java/expo/modules/notifications/notifications/presentation/builders/ExpoNotificationBuilder.java

@@ -7,7 +7,6 @@ import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.provider.Settings;
@@ -34,8 +33,6 @@ public class ExpoNotificationBuilder extends ChannelAwareNotificationBuilder {
   public static final String EXTRAS_MARSHALLED_NOTIFICATION_REQUEST_KEY = "expo.notification_request";
   private static final String EXTRAS_BODY_KEY = "body";
 
-  private static final long[] NO_VIBRATE_PATTERN = new long[]{0, 0};
-
   public ExpoNotificationBuilder(Context context) {
     super(context);
   }

package/android/src/main/java/expo/modules/notifications/service/NotificationsService.kt

@@ -10,6 +10,7 @@ import android.net.Uri
 import android.os.*
 import android.util.Log
 import androidx.core.app.RemoteInput
+import expo.modules.core.interfaces.DoNotStrip
 import expo.modules.notifications.BuildConfig
 import expo.modules.notifications.notifications.model.*
 import expo.modules.notifications.service.delegates.ExpoCategoriesDelegate
@@ -86,9 +87,9 @@ open class NotificationsService : BroadcastReceiver() {
     fun getAllPresented(context: Context, receiver: ResultReceiver? = null) {
       doWork(
         context,
-        Intent(NOTIFICATION_EVENT_ACTION, getUriBuilder().build()).also {
-          it.putExtra(EVENT_TYPE_KEY, GET_ALL_DISPLAYED_TYPE)
-          it.putExtra(RECEIVER_KEY, receiver)
+        Intent(NOTIFICATION_EVENT_ACTION, getUriBuilder().build()).apply {
+          putExtra(EVENT_TYPE_KEY, GET_ALL_DISPLAYED_TYPE)
+          putExtra(RECEIVER_KEY, receiver)
         }
       )
     }
@@ -105,11 +106,11 @@ open class NotificationsService : BroadcastReceiver() {
       val data = getUriBuilderForIdentifier(notification.notificationRequest.identifier).appendPath("present").build()
       doWork(
         context,
-        Intent(NOTIFICATION_EVENT_ACTION, data).also { intent ->
-          intent.putExtra(EVENT_TYPE_KEY, PRESENT_TYPE)
-          intent.putExtra(NOTIFICATION_KEY, notification)
-          intent.putExtra(NOTIFICATION_BEHAVIOR_KEY, behavior)
-          intent.putExtra(RECEIVER_KEY, receiver)
+        Intent(NOTIFICATION_EVENT_ACTION, data).apply {
+          putExtra(EVENT_TYPE_KEY, PRESENT_TYPE)
+          putExtra(NOTIFICATION_KEY, notification)
+          putExtra(NOTIFICATION_BEHAVIOR_KEY, behavior)
+          putExtra(RECEIVER_KEY, receiver)
         }
       )
     }
@@ -125,10 +126,10 @@ open class NotificationsService : BroadcastReceiver() {
       val data = getUriBuilderForIdentifier(notification.notificationRequest.identifier).appendPath("receive").build()
       doWork(
         context,
-        Intent(NOTIFICATION_EVENT_ACTION, data).also { intent ->
-          intent.putExtra(EVENT_TYPE_KEY, RECEIVE_TYPE)
-          intent.putExtra(NOTIFICATION_KEY, notification)
-          intent.putExtra(RECEIVER_KEY, receiver)
+        Intent(NOTIFICATION_EVENT_ACTION, data).apply {
+          putExtra(EVENT_TYPE_KEY, RECEIVE_TYPE)
+          putExtra(NOTIFICATION_KEY, notification)
+          putExtra(RECEIVER_KEY, receiver)
         }
       )
     }
@@ -144,10 +145,10 @@ open class NotificationsService : BroadcastReceiver() {
       val data = getUriBuilder().appendPath("dismiss").build()
       doWork(
         context,
-        Intent(NOTIFICATION_EVENT_ACTION, data).also { intent ->
-          intent.putExtra(EVENT_TYPE_KEY, DISMISS_SELECTED_TYPE)
-          intent.putExtra(IDENTIFIERS_KEY, identifiers)
-          intent.putExtra(RECEIVER_KEY, receiver)
+        Intent(NOTIFICATION_EVENT_ACTION, data).apply {
+          putExtra(EVENT_TYPE_KEY, DISMISS_SELECTED_TYPE)
+          putExtra(IDENTIFIERS_KEY, identifiers)
+          putExtra(RECEIVER_KEY, receiver)
         }
       )
     }
@@ -162,9 +163,9 @@ open class NotificationsService : BroadcastReceiver() {
       val data = getUriBuilder().appendPath("dismiss").build()
       doWork(
         context,
-        Intent(NOTIFICATION_EVENT_ACTION, data).also { intent ->
-          intent.putExtra(EVENT_TYPE_KEY, DISMISS_ALL_TYPE)
-          intent.putExtra(RECEIVER_KEY, receiver)
+        Intent(NOTIFICATION_EVENT_ACTION, data).apply {
+          putExtra(EVENT_TYPE_KEY, DISMISS_ALL_TYPE)
+          putExtra(RECEIVER_KEY, receiver)
         }
       )
     }
@@ -177,8 +178,8 @@ open class NotificationsService : BroadcastReceiver() {
     fun handleDropped(context: Context) {
       doWork(
         context,
-        Intent(NOTIFICATION_EVENT_ACTION).also { intent ->
-          intent.putExtra(EVENT_TYPE_KEY, DROPPED_TYPE)
+        Intent(NOTIFICATION_EVENT_ACTION).apply {
+          putExtra(EVENT_TYPE_KEY, DROPPED_TYPE)
         }
       )
     }
@@ -196,9 +197,9 @@ open class NotificationsService : BroadcastReceiver() {
           getUriBuilder()
             .appendPath("categories")
             .build()
-        ).also {
-          it.putExtra(EVENT_TYPE_KEY, GET_CATEGORIES_TYPE)
-          it.putExtra(RECEIVER_KEY, receiver)
+        ).apply {
+          putExtra(EVENT_TYPE_KEY, GET_CATEGORIES_TYPE)
+          putExtra(RECEIVER_KEY, receiver)
         }
       )
     }
@@ -218,10 +219,10 @@ open class NotificationsService : BroadcastReceiver() {
             .appendPath("categories")
             .appendPath(category.identifier)
             .build()
-        ).also {
-          it.putExtra(EVENT_TYPE_KEY, SET_CATEGORY_TYPE)
-          it.putExtra(NOTIFICATION_CATEGORY_KEY, category as Parcelable)
-          it.putExtra(RECEIVER_KEY, receiver)
+        ).apply {
+          putExtra(EVENT_TYPE_KEY, SET_CATEGORY_TYPE)
+          putExtra(NOTIFICATION_CATEGORY_KEY, category as Parcelable)
+          putExtra(RECEIVER_KEY, receiver)
         }
       )
     }
@@ -241,10 +242,10 @@ open class NotificationsService : BroadcastReceiver() {
             .appendPath("categories")
             .appendPath(identifier)
             .build()
-        ).also {
-          it.putExtra(EVENT_TYPE_KEY, DELETE_CATEGORY_TYPE)
-          it.putExtra(IDENTIFIER_KEY, identifier)
-          it.putExtra(RECEIVER_KEY, receiver)
+        ).apply {
+          putExtra(EVENT_TYPE_KEY, DELETE_CATEGORY_TYPE)
+          putExtra(IDENTIFIER_KEY, identifier)
+          putExtra(RECEIVER_KEY, receiver)
         }
       )
     }
@@ -266,12 +267,13 @@ open class NotificationsService : BroadcastReceiver() {
     }
 
     /**
-     * Fetches scheduled notification asynchronously.
+     * Fetches scheduled notification asynchronously. Used in Expo Go's ScopedNotificationScheduler.kt
      *
      * @param context Context this is being called from
      * @param identifier Identifier of the notification to be fetched
      * @param resultReceiver Receiver to be called with the results
      */
+    @DoNotStrip
     fun getScheduledNotification(context: Context, identifier: String, resultReceiver: ResultReceiver? = null) {
       doWork(
         context,
@@ -305,10 +307,10 @@ open class NotificationsService : BroadcastReceiver() {
             .appendPath("scheduled")
             .appendPath(notificationRequest.identifier)
             .build()
-        ).also { intent ->
-          intent.putExtra(EVENT_TYPE_KEY, SCHEDULE_TYPE)
-          intent.putExtra(NOTIFICATION_REQUEST_KEY, notificationRequest as Parcelable)
-          intent.putExtra(RECEIVER_KEY, resultReceiver)
+        ).apply {
+          putExtra(EVENT_TYPE_KEY, SCHEDULE_TYPE)
+          putExtra(NOTIFICATION_REQUEST_KEY, notificationRequest as Parcelable)
+          putExtra(RECEIVER_KEY, resultReceiver)
         }
       )
     }
@@ -338,10 +340,10 @@ open class NotificationsService : BroadcastReceiver() {
           getUriBuilder()
             .appendPath("scheduled")
             .build()
-        ).also { intent ->
-          intent.putExtra(EVENT_TYPE_KEY, REMOVE_SELECTED_TYPE)
-          intent.putExtra(IDENTIFIERS_KEY, identifiers.toTypedArray())
-          intent.putExtra(RECEIVER_KEY, resultReceiver)
+        ).apply {
+          putExtra(EVENT_TYPE_KEY, REMOVE_SELECTED_TYPE)
+          putExtra(IDENTIFIERS_KEY, identifiers.toTypedArray())
+          putExtra(RECEIVER_KEY, resultReceiver)
         }
       )
     }
@@ -355,9 +357,9 @@ open class NotificationsService : BroadcastReceiver() {
     fun removeAllScheduledNotifications(context: Context, resultReceiver: ResultReceiver? = null) {
       doWork(
         context,
-        Intent(NOTIFICATION_EVENT_ACTION).also { intent ->
-          intent.putExtra(EVENT_TYPE_KEY, REMOVE_ALL_TYPE)
-          intent.putExtra(RECEIVER_KEY, resultReceiver)
+        Intent(NOTIFICATION_EVENT_ACTION).apply {
+          putExtra(EVENT_TYPE_KEY, REMOVE_ALL_TYPE)
+          putExtra(RECEIVER_KEY, resultReceiver)
         }
       )
     }
@@ -511,6 +513,8 @@ open class NotificationsService : BroadcastReceiver() {
       return response
     }
 
+    // this is used by Expo Go's Kernel.kt
+    @DoNotStrip
     fun getNotificationResponseFromOpenIntent(intent: Intent): NotificationResponse? {
       intent.getByteArrayExtra(NOTIFICATION_RESPONSE_KEY)?.let { return unmarshalObject(NotificationResponse.CREATOR, it) }
       intent.getByteArrayExtra(TEXT_INPUT_NOTIFICATION_RESPONSE_KEY)?.let { return unmarshalObject(TextInputNotificationResponse.CREATOR, it) }

package/android/src/main/java/expo/modules/notifications/service/delegates/ExpoPresentationDelegate.kt

@@ -4,6 +4,7 @@ import android.app.NotificationManager
 import android.content.Context
 import android.media.RingtoneManager
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.os.Parcel
 import android.provider.Settings
@@ -21,11 +22,13 @@ import expo.modules.notifications.notifications.presentation.builders.ExpoNotifi
 import expo.modules.notifications.service.interfaces.PresentationDelegate
 import org.json.JSONException
 import org.json.JSONObject
-import java.util.*
+import java.util.Date
 
 open class ExpoPresentationDelegate(
-  protected val context: Context
+  protected val context: Context,
+  private val notificationManager: NotificationManagerCompat = NotificationManagerCompat.from(context)
 ) : PresentationDelegate {
+
   companion object {
     protected const val ANDROID_NOTIFICATION_ID = 0
 
@@ -87,9 +90,10 @@ open class ExpoPresentationDelegate(
   override fun presentNotification(notification: Notification, behavior: NotificationBehavior?) {
     if (behavior != null && !behavior.shouldShowAlert()) {
       if (behavior.shouldPlaySound()) {
+        val sound = getNotificationSoundUri(notification) ?: Settings.System.DEFAULT_NOTIFICATION_URI
         RingtoneManager.getRingtone(
           context,
-          notification.notificationRequest.content.sound ?: Settings.System.DEFAULT_NOTIFICATION_URI
+          sound
         ).play()
       }
       return
@@ -101,6 +105,16 @@ open class ExpoPresentationDelegate(
     )
   }
 
+  private fun getNotificationSoundUri(notification: Notification): Uri? {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      notification.notificationRequest.trigger.notificationChannel?.let {
+        notificationManager.getNotificationChannel(it)?.sound
+      }
+    } else {
+      notification.notificationRequest.content.sound
+    }
+  }
+
   protected open fun getNotifyId(request: NotificationRequest?): Int {
     return ANDROID_NOTIFICATION_ID
   }

package/build/NotificationPermissions.d.ts

@@ -35,7 +35,6 @@ export declare function getPermissionsAsync(): Promise<NotificationPermissionsSt
  *       allowAlert: true,
  *       allowBadge: true,
  *       allowSound: true,
- *       allowAnnouncements: true,
  *     },
  *   });
  * }

package/build/NotificationPermissions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NotificationPermissions.d.ts","sourceRoot":"","sources":["../src/NotificationPermissions.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,8BAA8B,EAC9B,6BAA6B,EAC9B,MAAM,iCAAiC,CAAC;AAGzC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,mBAAmB,2CAMxC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,uBAAuB,CAAC,WAAW,CAAC,EAAE,8BAA8B,0CAczF;AAGD;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,iPAMzB,CAAC"}
+{"version":3,"file":"NotificationPermissions.d.ts","sourceRoot":"","sources":["../src/NotificationPermissions.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,8BAA8B,EAC9B,6BAA6B,EAC9B,MAAM,iCAAiC,CAAC;AAGzC;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,mBAAmB,2CAMxC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,uBAAuB,CAAC,WAAW,CAAC,EAAE,8BAA8B,0CAczF;AAGD;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,iPAMzB,CAAC"}

package/build/NotificationPermissions.js

@@ -41,7 +41,6 @@ export async function getPermissionsAsync() {
  *       allowAlert: true,
  *       allowBadge: true,
  *       allowSound: true,
- *       allowAnnouncements: true,
  *     },
  *   });
  * }

package/build/NotificationPermissions.js.map

@@ -1 +1 @@
-{"version":3,"file":"NotificationPermissions.js","sourceRoot":"","sources":["../src/NotificationPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAMxF,OAAO,6BAA6B,MAAM,iCAAiC,CAAC;AAE5E;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB;IACvC,IAAI,CAAC,6BAA6B,CAAC,mBAAmB,EAAE;QACtD,MAAM,IAAI,mBAAmB,CAAC,eAAe,EAAE,qBAAqB,CAAC,CAAC;KACvE;IAED,OAAO,MAAM,6BAA6B,CAAC,mBAAmB,EAAE,CAAC;AACnE,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,WAA4C;IACxF,IAAI,CAAC,6BAA6B,CAAC,uBAAuB,EAAE;QAC1D,MAAM,IAAI,mBAAmB,CAAC,eAAe,EAAE,yBAAyB,CAAC,CAAC;KAC3E;IAED,MAAM,oBAAoB,GAAG,WAAW,IAAI;QAC1C,GAAG,EAAE;YACH,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,IAAI;SACjB;KACF,CAAC;IACF,MAAM,4BAA4B,GAAG,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvE,OAAO,MAAM,6BAA6B,CAAC,uBAAuB,CAAC,4BAA4B,CAAC,CAAC;AACnG,CAAC;AAED,cAAc;AACd;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,oBAAoB,CAGhD;IACA,aAAa,EAAE,uBAAuB;IACtC,SAAS,EAAE,mBAAmB;CAC/B,CAAC,CAAC","sourcesContent":["import { createPermissionHook, Platform, UnavailabilityError } from 'expo-modules-core';\n\nimport {\n  NotificationPermissionsRequest,\n  NotificationPermissionsStatus,\n} from './NotificationPermissions.types';\nimport NotificationPermissionsModule from './NotificationPermissionsModule';\n\n/**\n * Calling this function checks current permissions settings related to notifications.\n * It lets you verify whether the app is currently allowed to display alerts, play sounds, etc.\n * There is no user-facing effect of calling this.\n * @return It returns a `Promise` resolving to an object represents permission settings ([`NotificationPermissionsStatus`](#notificationpermissionsstatus)).\n * On iOS, make sure you [properly interpret the permissions response](#interpret-the-ios-permissions-response).\n * @example Check if the app is allowed to send any type of notifications (interrupting and non-interrupting–provisional on iOS).\n * ```ts\n * import * as Notifications from 'expo-notifications';\n *\n * export async function allowsNotificationsAsync() {\n *   const settings = await Notifications.getPermissionsAsync();\n *   return (\n *     settings.granted || settings.ios?.status === Notifications.IosAuthorizationStatus.PROVISIONAL\n *   );\n * }\n * ```\n * @header permissions\n */\nexport async function getPermissionsAsync() {\n  if (!NotificationPermissionsModule.getPermissionsAsync) {\n    throw new UnavailabilityError('Notifications', 'getPermissionsAsync');\n  }\n\n  return await NotificationPermissionsModule.getPermissionsAsync();\n}\n\n/**\n * Prompts the user for notification permissions according to request. **Request defaults to asking the user to allow displaying alerts,\n * setting badge count and playing sounds**.\n * @param permissions An object representing configuration for the request scope.\n * @return It returns a Promise resolving to an object represents permission settings ([`NotificationPermissionsStatus`](#notificationpermissionsstatus)).\n * On iOS, make sure you [properly interpret the permissions response](#interpret-the-ios-permissions-response).\n * @example Prompts the user to allow the app to show alerts, play sounds, set badge count and let Siri read out messages through AirPods.\n * ```ts\n * import * as Notifications from 'expo-notifications';\n *\n * export function requestPermissionsAsync() {\n *   return await Notifications.requestPermissionsAsync({\n *     ios: {\n *       allowAlert: true,\n *       allowBadge: true,\n *       allowSound: true,\n *       allowAnnouncements: true,\n *     },\n *   });\n * }\n * ```\n * @header permissions\n */\nexport async function requestPermissionsAsync(permissions?: NotificationPermissionsRequest) {\n  if (!NotificationPermissionsModule.requestPermissionsAsync) {\n    throw new UnavailabilityError('Notifications', 'requestPermissionsAsync');\n  }\n\n  const requestedPermissions = permissions ?? {\n    ios: {\n      allowAlert: true,\n      allowBadge: true,\n      allowSound: true,\n    },\n  };\n  const requestedPlatformPermissions = requestedPermissions[Platform.OS];\n  return await NotificationPermissionsModule.requestPermissionsAsync(requestedPlatformPermissions);\n}\n\n// @needsAudit\n/**\n * Check or request permissions to send and receive push notifications.\n * This uses both `requestPermissionsAsync` and `getPermissionsAsync` to interact with the permissions.\n * @example\n * ```ts\n * const [permissionResponse, requestPermission] = Notifications.usePermissions();\n * ```\n * @header permission\n */\nexport const usePermissions = createPermissionHook<\n  NotificationPermissionsStatus,\n  NotificationPermissionsRequest\n>({\n  requestMethod: requestPermissionsAsync,\n  getMethod: getPermissionsAsync,\n});\n"]}
+{"version":3,"file":"NotificationPermissions.js","sourceRoot":"","sources":["../src/NotificationPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAMxF,OAAO,6BAA6B,MAAM,iCAAiC,CAAC;AAE5E;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB;IACvC,IAAI,CAAC,6BAA6B,CAAC,mBAAmB,EAAE;QACtD,MAAM,IAAI,mBAAmB,CAAC,eAAe,EAAE,qBAAqB,CAAC,CAAC;KACvE;IAED,OAAO,MAAM,6BAA6B,CAAC,mBAAmB,EAAE,CAAC;AACnE,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,WAA4C;IACxF,IAAI,CAAC,6BAA6B,CAAC,uBAAuB,EAAE;QAC1D,MAAM,IAAI,mBAAmB,CAAC,eAAe,EAAE,yBAAyB,CAAC,CAAC;KAC3E;IAED,MAAM,oBAAoB,GAAG,WAAW,IAAI;QAC1C,GAAG,EAAE;YACH,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,IAAI;SACjB;KACF,CAAC;IACF,MAAM,4BAA4B,GAAG,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvE,OAAO,MAAM,6BAA6B,CAAC,uBAAuB,CAAC,4BAA4B,CAAC,CAAC;AACnG,CAAC;AAED,cAAc;AACd;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,oBAAoB,CAGhD;IACA,aAAa,EAAE,uBAAuB;IACtC,SAAS,EAAE,mBAAmB;CAC/B,CAAC,CAAC","sourcesContent":["import { createPermissionHook, Platform, UnavailabilityError } from 'expo-modules-core';\n\nimport {\n  NotificationPermissionsRequest,\n  NotificationPermissionsStatus,\n} from './NotificationPermissions.types';\nimport NotificationPermissionsModule from './NotificationPermissionsModule';\n\n/**\n * Calling this function checks current permissions settings related to notifications.\n * It lets you verify whether the app is currently allowed to display alerts, play sounds, etc.\n * There is no user-facing effect of calling this.\n * @return It returns a `Promise` resolving to an object represents permission settings ([`NotificationPermissionsStatus`](#notificationpermissionsstatus)).\n * On iOS, make sure you [properly interpret the permissions response](#interpret-the-ios-permissions-response).\n * @example Check if the app is allowed to send any type of notifications (interrupting and non-interrupting–provisional on iOS).\n * ```ts\n * import * as Notifications from 'expo-notifications';\n *\n * export async function allowsNotificationsAsync() {\n *   const settings = await Notifications.getPermissionsAsync();\n *   return (\n *     settings.granted || settings.ios?.status === Notifications.IosAuthorizationStatus.PROVISIONAL\n *   );\n * }\n * ```\n * @header permissions\n */\nexport async function getPermissionsAsync() {\n  if (!NotificationPermissionsModule.getPermissionsAsync) {\n    throw new UnavailabilityError('Notifications', 'getPermissionsAsync');\n  }\n\n  return await NotificationPermissionsModule.getPermissionsAsync();\n}\n\n/**\n * Prompts the user for notification permissions according to request. **Request defaults to asking the user to allow displaying alerts,\n * setting badge count and playing sounds**.\n * @param permissions An object representing configuration for the request scope.\n * @return It returns a Promise resolving to an object represents permission settings ([`NotificationPermissionsStatus`](#notificationpermissionsstatus)).\n * On iOS, make sure you [properly interpret the permissions response](#interpret-the-ios-permissions-response).\n * @example Prompts the user to allow the app to show alerts, play sounds, set badge count and let Siri read out messages through AirPods.\n * ```ts\n * import * as Notifications from 'expo-notifications';\n *\n * export function requestPermissionsAsync() {\n *   return await Notifications.requestPermissionsAsync({\n *     ios: {\n *       allowAlert: true,\n *       allowBadge: true,\n *       allowSound: true,\n *     },\n *   });\n * }\n * ```\n * @header permissions\n */\nexport async function requestPermissionsAsync(permissions?: NotificationPermissionsRequest) {\n  if (!NotificationPermissionsModule.requestPermissionsAsync) {\n    throw new UnavailabilityError('Notifications', 'requestPermissionsAsync');\n  }\n\n  const requestedPermissions = permissions ?? {\n    ios: {\n      allowAlert: true,\n      allowBadge: true,\n      allowSound: true,\n    },\n  };\n  const requestedPlatformPermissions = requestedPermissions[Platform.OS];\n  return await NotificationPermissionsModule.requestPermissionsAsync(requestedPlatformPermissions);\n}\n\n// @needsAudit\n/**\n * Check or request permissions to send and receive push notifications.\n * This uses both `requestPermissionsAsync` and `getPermissionsAsync` to interact with the permissions.\n * @example\n * ```ts\n * const [permissionResponse, requestPermission] = Notifications.usePermissions();\n * ```\n * @header permission\n */\nexport const usePermissions = createPermissionHook<\n  NotificationPermissionsStatus,\n  NotificationPermissionsRequest\n>({\n  requestMethod: requestPermissionsAsync,\n  getMethod: getPermissionsAsync,\n});\n"]}

package/build/NotificationPermissions.types.d.ts

@@ -70,11 +70,6 @@ export interface IosNotificationPermissionsRequest {
      * The ability to post noninterrupting notifications provisionally to the Notification Center.
      */
     allowProvisional?: boolean;
-    /**
-     * The ability for Siri to automatically read out messages over AirPods.
-     * @deprecated
-     */
-    allowAnnouncements?: boolean;
 }
 export type NativeNotificationPermissionsRequest = IosNotificationPermissionsRequest | object;
 /**

package/build/NotificationPermissions.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NotificationPermissions.types.d.ts","sourceRoot":"","sources":["../src/NotificationPermissions.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE9E,oBAAY,aAAa;IACvB,IAAI,IAAI;IACR,MAAM,IAAI;IACV,KAAK,IAAI;CACV;AAED,oBAAY,iBAAiB;IAC3B,KAAK,IAAI;IACT,MAAM,IAAI;IACV,kBAAkB,IAAI;CACvB;AAED,oBAAY,sBAAsB;IAChC,cAAc,IAAI;IAClB,MAAM,IAAI;IACV,UAAU,IAAI;IACd,WAAW,IAAI;IACf,SAAS,IAAI;CACd;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAC;AAGjC,MAAM,WAAW,6BAA8B,SAAQ,kBAAkB;IACvE,OAAO,CAAC,EAAE;QACR,UAAU,EAAE,MAAM,CAAC;QACnB,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,MAAM,EAAE,sBAAsB,CAAC;QAC/B,iCAAiC,EAAE,OAAO,GAAG,IAAI,CAAC;QAClD,yBAAyB,EAAE,OAAO,GAAG,IAAI,CAAC;QAC1C,sBAAsB,EAAE,OAAO,GAAG,IAAI,CAAC;QACvC,WAAW,EAAE,OAAO,GAAG,IAAI,CAAC;QAC5B,WAAW,EAAE,OAAO,GAAG,IAAI,CAAC;QAC5B,WAAW,EAAE,OAAO,GAAG,IAAI,CAAC;QAC5B,oBAAoB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;QACtC,UAAU,EAAE,aAAa,CAAC;QAC1B,cAAc,CAAC,EAAE,iBAAiB,CAAC;QACnC,+BAA+B,CAAC,EAAE,OAAO,CAAC;QAC1C,mBAAmB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;KACtC,CAAC;CACH;AAED;;;GAGG;AACH,MAAM,WAAW,iCAAiC;IAChD;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,8BAA8B,CAAC,EAAE,OAAO,CAAC;IACzC;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,MAAM,oCAAoC,GAAG,iCAAiC,GAAG,MAAM,CAAC;AAE9F;;;GAGG;AACH,MAAM,WAAW,8BAA8B;IAC7C;;OAEG;IACH,GAAG,CAAC,EAAE,iCAAiC,CAAC;IACxC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB"}
+{"version":3,"file":"NotificationPermissions.types.d.ts","sourceRoot":"","sources":["../src/NotificationPermissions.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE9E,oBAAY,aAAa;IACvB,IAAI,IAAI;IACR,MAAM,IAAI;IACV,KAAK,IAAI;CACV;AAED,oBAAY,iBAAiB;IAC3B,KAAK,IAAI;IACT,MAAM,IAAI;IACV,kBAAkB,IAAI;CACvB;AAED,oBAAY,sBAAsB;IAChC,cAAc,IAAI;IAClB,MAAM,IAAI;IACV,UAAU,IAAI;IACd,WAAW,IAAI;IACf,SAAS,IAAI;CACd;AAED,OAAO,EAAE,qBAAqB,EAAE,CAAC;AAGjC,MAAM,WAAW,6BAA8B,SAAQ,kBAAkB;IACvE,OAAO,CAAC,EAAE;QACR,UAAU,EAAE,MAAM,CAAC;QACnB,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B,CAAC;IACF,GAAG,CAAC,EAAE;QACJ,MAAM,EAAE,sBAAsB,CAAC;QAC/B,iCAAiC,EAAE,OAAO,GAAG,IAAI,CAAC;QAClD,yBAAyB,EAAE,OAAO,GAAG,IAAI,CAAC;QAC1C,sBAAsB,EAAE,OAAO,GAAG,IAAI,CAAC;QACvC,WAAW,EAAE,OAAO,GAAG,IAAI,CAAC;QAC5B,WAAW,EAAE,OAAO,GAAG,IAAI,CAAC;QAC5B,WAAW,EAAE,OAAO,GAAG,IAAI,CAAC;QAC5B,oBAAoB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;QACtC,UAAU,EAAE,aAAa,CAAC;QAC1B,cAAc,CAAC,EAAE,iBAAiB,CAAC;QACnC,+BAA+B,CAAC,EAAE,OAAO,CAAC;QAC1C,mBAAmB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;KACtC,CAAC;CACH;AAED;;;GAGG;AACH,MAAM,WAAW,iCAAiC;IAChD;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;OAEG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,8BAA8B,CAAC,EAAE,OAAO,CAAC;IACzC;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,MAAM,oCAAoC,GAAG,iCAAiC,GAAG,MAAM,CAAC;AAE9F;;;GAGG;AACH,MAAM,WAAW,8BAA8B;IAC7C;;OAEG;IACH,GAAG,CAAC,EAAE,iCAAiC,CAAC;IACxC;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB"}