expo-notifications 1.0.0-canary-20240814-ce0f7d5 → 1.0.0-canary-20240904-69100c1

package/CHANGELOG.md

@@ -10,8 +10,11 @@
 
 ### 🐛 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))
 
 ### 💡 Others
 

package/android/build.gradle

@@ -20,6 +20,17 @@ android {
   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

@@ -23,6 +23,7 @@ import java.util.Map;
 import java.util.Set;
 
 import expo.modules.notifications.notifications.interfaces.NotificationTrigger;
+import expo.modules.notifications.notifications.interfaces.SchedulableNotificationTrigger;
 import expo.modules.notifications.notifications.model.Notification;
 import expo.modules.notifications.notifications.model.NotificationContent;
 import expo.modules.notifications.notifications.model.NotificationRequest;
@@ -60,19 +61,30 @@ public class NotificationSerializer {
     serializedRequest.putBundle("trigger", toBundle(request.getTrigger()));
     Bundle content = toBundle(request.getContent());
     Bundle existingContentData = content.getBundle("data");
-    if (existingContentData == null && request.getTrigger() instanceof FirebaseNotificationTrigger trigger) {
-      RemoteMessage message = trigger.getRemoteMessage();
-      RemoteMessage.Notification notification = message.getNotification();
-      Map<String, String> data = message.getData();
-      String dataBody = data.get("body");
-      String notificationBody = notification != null ? notification.getBody() : null;
-      if (isValidJSONString(dataBody) && notificationBody != null && notificationBody.equals(data.get("message"))) {
-        // Expo sends notification.body as data.message, and JSON stringifies data.body
-        content.putString("dataString", dataBody);
-      } else {
-        // The message was sent directly from Firebase or some other service,
-        // and we copy the data as is
-        content.putBundle("data", toBundle(data));
+    if (existingContentData == null) {
+      if(request.getTrigger() instanceof FirebaseNotificationTrigger trigger) {
+        RemoteMessage message = trigger.getRemoteMessage();
+        RemoteMessage.Notification notification = message.getNotification();
+        Map<String, String> data = message.getData();
+        String dataBody = data.get("body");
+        String notificationBody = notification != null ? notification.getBody() : null;
+        if (isValidJSONString(dataBody) && notificationBody != null && notificationBody.equals(data.get("message"))) {
+          // Expo sends notification.body as data.message, and JSON stringifies data.body
+          content.putString("dataString", dataBody);
+        } else {
+          // The message was sent directly from Firebase or some other service,
+          // and we copy the data as is
+          content.putBundle("data", toBundle(data));
+        }
+      } 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
+          content.putString("dataString", body.toString());
+        }
       }
     }
     serializedRequest.putBundle("content", content);

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/getAllScheduledNotificationsAsync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAllScheduledNotificationsAsync.d.ts","sourceRoot":"","sources":["../src/getAllScheduledNotificationsAsync.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D;;;;GAIG;AACH,wBAA8B,iCAAiC,IAAI,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAMhG"}
+{"version":3,"file":"getAllScheduledNotificationsAsync.d.ts","sourceRoot":"","sources":["../src/getAllScheduledNotificationsAsync.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5D;;;;GAIG;AACH,wBAA8B,iCAAiC,IAAI,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAQhG"}

package/build/getAllScheduledNotificationsAsync.js

@@ -1,5 +1,6 @@
 import { UnavailabilityError } from 'expo-modules-core';
 import NotificationScheduler from './NotificationScheduler';
+import { mapNotificationRequest } from './utils/mapNotificationResponse';
 /**
  * Fetches information about all scheduled notifications.
  * @return Returns a Promise resolving to an array of objects conforming to the [`Notification`](#notification) interface.
@@ -9,6 +10,6 @@ export default async function getAllScheduledNotificationsAsync() {
     if (!NotificationScheduler.getAllScheduledNotificationsAsync) {
         throw new UnavailabilityError('Notifications', 'getAllScheduledNotificationsAsync');
     }
-    return await NotificationScheduler.getAllScheduledNotificationsAsync();
+    return (await NotificationScheduler.getAllScheduledNotificationsAsync()).map((request) => mapNotificationRequest(request));
 }
 //# sourceMappingURL=getAllScheduledNotificationsAsync.js.map

package/build/getAllScheduledNotificationsAsync.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAllScheduledNotificationsAsync.js","sourceRoot":"","sources":["../src/getAllScheduledNotificationsAsync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAG5D;;;;GAIG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iCAAiC;IAC7D,IAAI,CAAC,qBAAqB,CAAC,iCAAiC,EAAE;QAC5D,MAAM,IAAI,mBAAmB,CAAC,eAAe,EAAE,mCAAmC,CAAC,CAAC;KACrF;IAED,OAAO,MAAM,qBAAqB,CAAC,iCAAiC,EAAE,CAAC;AACzE,CAAC","sourcesContent":["import { UnavailabilityError } from 'expo-modules-core';\n\nimport NotificationScheduler from './NotificationScheduler';\nimport { NotificationRequest } from './Notifications.types';\n\n/**\n * Fetches information about all scheduled notifications.\n * @return Returns a Promise resolving to an array of objects conforming to the [`Notification`](#notification) interface.\n * @header schedule\n */\nexport default async function getAllScheduledNotificationsAsync(): Promise<NotificationRequest[]> {\n  if (!NotificationScheduler.getAllScheduledNotificationsAsync) {\n    throw new UnavailabilityError('Notifications', 'getAllScheduledNotificationsAsync');\n  }\n\n  return await NotificationScheduler.getAllScheduledNotificationsAsync();\n}\n"]}
+{"version":3,"file":"getAllScheduledNotificationsAsync.js","sourceRoot":"","sources":["../src/getAllScheduledNotificationsAsync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,qBAAqB,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAEzE;;;;GAIG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,iCAAiC;IAC7D,IAAI,CAAC,qBAAqB,CAAC,iCAAiC,EAAE;QAC5D,MAAM,IAAI,mBAAmB,CAAC,eAAe,EAAE,mCAAmC,CAAC,CAAC;KACrF;IAED,OAAO,CAAC,MAAM,qBAAqB,CAAC,iCAAiC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CACvF,sBAAsB,CAAC,OAAO,CAAC,CAChC,CAAC;AACJ,CAAC","sourcesContent":["import { UnavailabilityError } from 'expo-modules-core';\n\nimport NotificationScheduler from './NotificationScheduler';\nimport { NotificationRequest } from './Notifications.types';\nimport { mapNotificationRequest } from './utils/mapNotificationResponse';\n\n/**\n * Fetches information about all scheduled notifications.\n * @return Returns a Promise resolving to an array of objects conforming to the [`Notification`](#notification) interface.\n * @header schedule\n */\nexport default async function getAllScheduledNotificationsAsync(): Promise<NotificationRequest[]> {\n  if (!NotificationScheduler.getAllScheduledNotificationsAsync) {\n    throw new UnavailabilityError('Notifications', 'getAllScheduledNotificationsAsync');\n  }\n\n  return (await NotificationScheduler.getAllScheduledNotificationsAsync()).map((request) =>\n    mapNotificationRequest(request)\n  );\n}\n"]}

package/build/getPresentedNotificationsAsync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getPresentedNotificationsAsync.d.ts","sourceRoot":"","sources":["../src/getPresentedNotificationsAsync.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAErD;;;;;GAKG;AACH,wBAA8B,8BAA8B,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAMtF"}
+{"version":3,"file":"getPresentedNotificationsAsync.d.ts","sourceRoot":"","sources":["../src/getPresentedNotificationsAsync.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAGrD;;;;;GAKG;AACH,wBAA8B,8BAA8B,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC,CAQtF"}

package/build/getPresentedNotificationsAsync.js

@@ -1,5 +1,6 @@
 import { UnavailabilityError } from 'expo-modules-core';
 import NotificationPresenter from './NotificationPresenterModule';
+import { mapNotification } from './utils/mapNotificationResponse';
 /**
  * Fetches information about all notifications present in the notification tray (Notification Center).
  * > This method is not supported on Android below 6.0 (API level 23) – on these devices it will resolve to an empty array.
@@ -10,6 +11,6 @@ export default async function getPresentedNotificationsAsync() {
     if (!NotificationPresenter.getPresentedNotificationsAsync) {
         throw new UnavailabilityError('Notifications', 'getPresentedNotificationsAsync');
     }
-    return await NotificationPresenter.getPresentedNotificationsAsync();
+    return (await NotificationPresenter.getPresentedNotificationsAsync()).map((notification) => mapNotification(notification));
 }
 //# sourceMappingURL=getPresentedNotificationsAsync.js.map

package/build/getPresentedNotificationsAsync.js.map

@@ -1 +1 @@
-{"version":3,"file":"getPresentedNotificationsAsync.js","sourceRoot":"","sources":["../src/getPresentedNotificationsAsync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,qBAAqB,MAAM,+BAA+B,CAAC;AAGlE;;;;;GAKG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,8BAA8B;IAC1D,IAAI,CAAC,qBAAqB,CAAC,8BAA8B,EAAE;QACzD,MAAM,IAAI,mBAAmB,CAAC,eAAe,EAAE,gCAAgC,CAAC,CAAC;KAClF;IAED,OAAO,MAAM,qBAAqB,CAAC,8BAA8B,EAAE,CAAC;AACtE,CAAC","sourcesContent":["import { UnavailabilityError } from 'expo-modules-core';\n\nimport NotificationPresenter from './NotificationPresenterModule';\nimport { Notification } from './Notifications.types';\n\n/**\n * Fetches information about all notifications present in the notification tray (Notification Center).\n * > This method is not supported on Android below 6.0 (API level 23) – on these devices it will resolve to an empty array.\n * @return A Promise which resolves with a list of notifications ([`Notification`](#notification)) currently present in the notification tray (Notification Center).\n * @header dismiss\n */\nexport default async function getPresentedNotificationsAsync(): Promise<Notification[]> {\n  if (!NotificationPresenter.getPresentedNotificationsAsync) {\n    throw new UnavailabilityError('Notifications', 'getPresentedNotificationsAsync');\n  }\n\n  return await NotificationPresenter.getPresentedNotificationsAsync();\n}\n"]}
+{"version":3,"file":"getPresentedNotificationsAsync.js","sourceRoot":"","sources":["../src/getPresentedNotificationsAsync.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAExD,OAAO,qBAAqB,MAAM,+BAA+B,CAAC;AAElE,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAElE;;;;;GAKG;AACH,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,8BAA8B;IAC1D,IAAI,CAAC,qBAAqB,CAAC,8BAA8B,EAAE;QACzD,MAAM,IAAI,mBAAmB,CAAC,eAAe,EAAE,gCAAgC,CAAC,CAAC;KAClF;IAED,OAAO,CAAC,MAAM,qBAAqB,CAAC,8BAA8B,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CACzF,eAAe,CAAC,YAAY,CAAC,CAC9B,CAAC;AACJ,CAAC","sourcesContent":["import { UnavailabilityError } from 'expo-modules-core';\n\nimport NotificationPresenter from './NotificationPresenterModule';\nimport { Notification } from './Notifications.types';\nimport { mapNotification } from './utils/mapNotificationResponse';\n\n/**\n * Fetches information about all notifications present in the notification tray (Notification Center).\n * > This method is not supported on Android below 6.0 (API level 23) – on these devices it will resolve to an empty array.\n * @return A Promise which resolves with a list of notifications ([`Notification`](#notification)) currently present in the notification tray (Notification Center).\n * @header dismiss\n */\nexport default async function getPresentedNotificationsAsync(): Promise<Notification[]> {\n  if (!NotificationPresenter.getPresentedNotificationsAsync) {\n    throw new UnavailabilityError('Notifications', 'getPresentedNotificationsAsync');\n  }\n\n  return (await NotificationPresenter.getPresentedNotificationsAsync()).map((notification) =>\n    mapNotification(notification)\n  );\n}\n"]}

package/build/utils/mapNotificationResponse.d.ts

@@ -1,4 +1,4 @@
-import { Notification, NotificationResponse } from '../Notifications.types';
+import { Notification, NotificationContent, NotificationRequest, NotificationResponse } from '../Notifications.types';
 /**
  * @hidden
  *
@@ -10,12 +10,15 @@ import { Notification, NotificationResponse } from '../Notifications.types';
  * @returns the mapped response.
  */
 export declare const mapNotificationResponse: (response: NotificationResponse) => {
-    notification: Notification & {
+    notification: {
         request: {
-            content: {
-                dataString?: string;
+            content: NotificationContent & {
+                dataString?: string | undefined;
             };
+            identifier: string;
+            trigger: import("../Notifications.types").NotificationTrigger;
         };
+        date: number;
     };
     actionIdentifier: string;
     userText?: string | undefined;
@@ -29,11 +32,41 @@ export declare const mapNotificationResponse: (response: NotificationResponse) =
  * @param notification The raw notification passed in from native code
  * @returns the mapped notification.
  */
-export declare const mapNotification: (notification: Notification) => Notification & {
+export declare const mapNotification: (notification: Notification) => {
     request: {
-        content: {
-            dataString?: string;
+        content: NotificationContent & {
+            dataString?: string | undefined;
         };
+        identifier: string;
+        trigger: import("../Notifications.types").NotificationTrigger;
     };
+    date: number;
+};
+/**
+ * @hidden
+ *
+ * Does any required processing of a notification request from native code
+ * before it is passed to other JS code.
+ *
+ * @param request The raw request passed in from native code
+ * @returns the mapped request.
+ */
+export declare const mapNotificationRequest: (request: NotificationRequest) => {
+    content: NotificationContent & {
+        dataString?: string | undefined;
+    };
+    identifier: string;
+    trigger: import("../Notifications.types").NotificationTrigger;
+};
+/**
+ * @hidden
+ * Does any required processing of notification content from native code
+ * before being passed to other JS code.
+ *
+ * @param content The raw content passed in from native code
+ * @returns the mapped content.
+ */
+export declare const mapNotificationContent: (content: NotificationContent) => NotificationContent & {
+    dataString?: string | undefined;
 };
 //# sourceMappingURL=mapNotificationResponse.d.ts.map

package/build/utils/mapNotificationResponse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mapNotificationResponse.d.ts","sourceRoot":"","sources":["../../src/utils/mapNotificationResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE5E;;;;;;;;;GASG;AACH,eAAO,MAAM,uBAAuB,aAAc,oBAAoB;;iBAkBzD;YAAE,OAAO,EAAE;gBAAE,UAAU,CAAC,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE;;;;CAbhD,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,iBAAkB,YAAY;aAE7C;QAAE,OAAO,EAAE;YAAE,UAAU,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE;CAYhD,CAAC"}
+{"version":3,"file":"mapNotificationResponse.d.ts","sourceRoot":"","sources":["../../src/utils/mapNotificationResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,mBAAmB,EACnB,oBAAoB,EACrB,MAAM,wBAAwB,CAAC;AAEhC;;;;;;;;;GASG;AACH,eAAO,MAAM,uBAAuB,aAAc,oBAAoB;;;;;;;;;;;;;CAKrE,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,iBAAkB,YAAY;;;;;;;;;CAGxD,CAAC;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,sBAAsB,YAAa,mBAAmB;;;;;;CAGjE,CAAC;AAEH;;;;;;;GAOG;AACH,eAAO,MAAM,sBAAsB,YAAa,mBAAmB;;CAYlE,CAAC"}

package/build/utils/mapNotificationResponse.js

@@ -23,18 +23,43 @@ export const mapNotificationResponse = (response) => {
  * @param notification The raw notification passed in from native code
  * @returns the mapped notification.
  */
-export const mapNotification = (notification) => {
-    const mappedNotification = { ...notification };
+export const mapNotification = (notification) => ({
+    ...notification,
+    request: mapNotificationRequest(notification.request),
+});
+/**
+ * @hidden
+ *
+ * Does any required processing of a notification request from native code
+ * before it is passed to other JS code.
+ *
+ * @param request The raw request passed in from native code
+ * @returns the mapped request.
+ */
+export const mapNotificationRequest = (request) => ({
+    ...request,
+    content: mapNotificationContent(request.content),
+});
+/**
+ * @hidden
+ * Does any required processing of notification content from native code
+ * before being passed to other JS code.
+ *
+ * @param content The raw content passed in from native code
+ * @returns the mapped content.
+ */
+export const mapNotificationContent = (content) => {
+    const mappedContent = { ...content };
     try {
-        const dataString = mappedNotification?.request?.content['dataString'];
+        const dataString = mappedContent['dataString'];
         if (typeof dataString === 'string') {
-            mappedNotification.request.content.data = JSON.parse(dataString);
-            delete mappedNotification.request.content.dataString;
+            mappedContent.data = JSON.parse(dataString);
+            delete mappedContent.dataString;
         }
     }
     catch (e) {
         console.log(`Error in notification: ${e}`);
     }
-    return mappedNotification;
+    return mappedContent;
 };
 //# sourceMappingURL=mapNotificationResponse.js.map

package/build/utils/mapNotificationResponse.js.map

@@ -1 +1 @@
-{"version":3,"file":"mapNotificationResponse.js","sourceRoot":"","sources":["../../src/utils/mapNotificationResponse.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,QAA8B,EAAE,EAAE;IACxE,OAAO;QACL,GAAG,QAAQ;QACX,YAAY,EAAE,eAAe,CAAC,QAAQ,CAAC,YAAY,CAAC;KACrD,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,YAA0B,EAAE,EAAE;IAC5D,MAAM,kBAAkB,GAEpB,EAAE,GAAG,YAAY,EAAE,CAAC;IACxB,IAAI;QACF,MAAM,UAAU,GAAG,kBAAkB,EAAE,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QACtE,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YAClC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YACjE,OAAO,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;SACtD;KACF;IAAC,OAAO,CAAM,EAAE;QACf,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,EAAE,CAAC,CAAC;KAC5C;IACD,OAAO,kBAAkB,CAAC;AAC5B,CAAC,CAAC","sourcesContent":["import { Notification, NotificationResponse } from '../Notifications.types';\n\n/**\n * @hidden\n *\n * Does any required processing of a notification response from native code\n * before it is passed to a notification response listener, or to the\n * last notification response hook.\n *\n * @param response The raw response passed in from native code\n * @returns the mapped response.\n */\nexport const mapNotificationResponse = (response: NotificationResponse) => {\n  return {\n    ...response,\n    notification: mapNotification(response.notification),\n  };\n};\n\n/**\n * @hidden\n *\n * Does any required processing of a notification from native code\n * before it is passed to a notification listener.\n *\n * @param notification The raw notification passed in from native code\n * @returns the mapped notification.\n */\nexport const mapNotification = (notification: Notification) => {\n  const mappedNotification: Notification & {\n    request: { content: { dataString?: string } };\n  } = { ...notification };\n  try {\n    const dataString = mappedNotification?.request?.content['dataString'];\n    if (typeof dataString === 'string') {\n      mappedNotification.request.content.data = JSON.parse(dataString);\n      delete mappedNotification.request.content.dataString;\n    }\n  } catch (e: any) {\n    console.log(`Error in notification: ${e}`);\n  }\n  return mappedNotification;\n};\n"]}
+{"version":3,"file":"mapNotificationResponse.js","sourceRoot":"","sources":["../../src/utils/mapNotificationResponse.ts"],"names":[],"mappings":"AAOA;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,QAA8B,EAAE,EAAE;IACxE,OAAO;QACL,GAAG,QAAQ;QACX,YAAY,EAAE,eAAe,CAAC,QAAQ,CAAC,YAAY,CAAC;KACrD,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,YAA0B,EAAE,EAAE,CAAC,CAAC;IAC9D,GAAG,YAAY;IACf,OAAO,EAAE,sBAAsB,CAAC,YAAY,CAAC,OAAO,CAAC;CACtD,CAAC,CAAC;AAEH;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAA4B,EAAE,EAAE,CAAC,CAAC;IACvE,GAAG,OAAO;IACV,OAAO,EAAE,sBAAsB,CAAC,OAAO,CAAC,OAAO,CAAC;CACjD,CAAC,CAAC;AAEH;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAA4B,EAAE,EAAE;IACrE,MAAM,aAAa,GAAkD,EAAE,GAAG,OAAO,EAAE,CAAC;IACpF,IAAI;QACF,MAAM,UAAU,GAAG,aAAa,CAAC,YAAY,CAAC,CAAC;QAC/C,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE;YAClC,aAAa,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC5C,OAAO,aAAa,CAAC,UAAU,CAAC;SACjC;KACF;IAAC,OAAO,CAAM,EAAE;QACf,OAAO,CAAC,GAAG,CAAC,0BAA0B,CAAC,EAAE,CAAC,CAAC;KAC5C;IACD,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC","sourcesContent":["import {\n  Notification,\n  NotificationContent,\n  NotificationRequest,\n  NotificationResponse,\n} from '../Notifications.types';\n\n/**\n * @hidden\n *\n * Does any required processing of a notification response from native code\n * before it is passed to a notification response listener, or to the\n * last notification response hook.\n *\n * @param response The raw response passed in from native code\n * @returns the mapped response.\n */\nexport const mapNotificationResponse = (response: NotificationResponse) => {\n  return {\n    ...response,\n    notification: mapNotification(response.notification),\n  };\n};\n\n/**\n * @hidden\n *\n * Does any required processing of a notification from native code\n * before it is passed to a notification listener.\n *\n * @param notification The raw notification passed in from native code\n * @returns the mapped notification.\n */\nexport const mapNotification = (notification: Notification) => ({\n  ...notification,\n  request: mapNotificationRequest(notification.request),\n});\n\n/**\n * @hidden\n *\n * Does any required processing of a notification request from native code\n * before it is passed to other JS code.\n *\n * @param request The raw request passed in from native code\n * @returns the mapped request.\n */\nexport const mapNotificationRequest = (request: NotificationRequest) => ({\n  ...request,\n  content: mapNotificationContent(request.content),\n});\n\n/**\n * @hidden\n * Does any required processing of notification content from native code\n * before being passed to other JS code.\n *\n * @param content The raw content passed in from native code\n * @returns the mapped content.\n */\nexport const mapNotificationContent = (content: NotificationContent) => {\n  const mappedContent: NotificationContent & { dataString?: string } = { ...content };\n  try {\n    const dataString = mappedContent['dataString'];\n    if (typeof dataString === 'string') {\n      mappedContent.data = JSON.parse(dataString);\n      delete mappedContent.dataString;\n    }\n  } catch (e: any) {\n    console.log(`Error in notification: ${e}`);\n  }\n  return mappedContent;\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-notifications",
-  "version": "1.0.0-canary-20240814-ce0f7d5",
+  "version": "1.0.0-canary-20240904-69100c1",
   "description": "Provides an API to fetch push notification tokens and to present, schedule, receive, and respond to notifications.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -38,18 +38,18 @@
     "preset": "expo-module-scripts/ios"
   },
   "dependencies": {
-    "@expo/image-utils": "0.5.2-canary-20240814-ce0f7d5",
+    "@expo/image-utils": "0.5.2-canary-20240904-69100c1",
     "@ide/backoff": "^1.0.0",
     "abort-controller": "^3.0.0",
     "assert": "^2.0.0",
     "badgin": "^1.1.5",
-    "expo-application": "6.0.0-canary-20240814-ce0f7d5",
-    "expo-constants": "17.0.0-canary-20240814-ce0f7d5",
+    "expo-application": "6.0.0-canary-20240904-69100c1",
+    "expo-constants": "17.0.0-canary-20240904-69100c1",
     "fs-extra": "^9.1.0"
   },
   "devDependencies": {
     "@types/node-fetch": "^2.5.7",
-    "expo-module-scripts": "3.6.0-canary-20240814-ce0f7d5",
+    "expo-module-scripts": "3.6.0-canary-20240904-69100c1",
     "memfs": "^3.2.0",
     "node-fetch": "^2.6.7"
   },
@@ -58,5 +58,5 @@
     "react": "*",
     "react-native": "*"
   },
-  "gitHead": "ce0f7d5c7eaec2c8d06ee4e0dc0e58cd6c1612ed"
+  "gitHead": "69100c1b099b707057c052ed8096e06cb208aca1"
 }

package/src/getAllScheduledNotificationsAsync.ts

@@ -2,6 +2,7 @@ import { UnavailabilityError } from 'expo-modules-core';
 
 import NotificationScheduler from './NotificationScheduler';
 import { NotificationRequest } from './Notifications.types';
+import { mapNotificationRequest } from './utils/mapNotificationResponse';
 
 /**
  * Fetches information about all scheduled notifications.
@@ -13,5 +14,7 @@ export default async function getAllScheduledNotificationsAsync(): Promise<Notif
     throw new UnavailabilityError('Notifications', 'getAllScheduledNotificationsAsync');
   }
 
-  return await NotificationScheduler.getAllScheduledNotificationsAsync();
+  return (await NotificationScheduler.getAllScheduledNotificationsAsync()).map((request) =>
+    mapNotificationRequest(request)
+  );
 }

package/src/getPresentedNotificationsAsync.ts

@@ -2,6 +2,7 @@ import { UnavailabilityError } from 'expo-modules-core';
 
 import NotificationPresenter from './NotificationPresenterModule';
 import { Notification } from './Notifications.types';
+import { mapNotification } from './utils/mapNotificationResponse';
 
 /**
  * Fetches information about all notifications present in the notification tray (Notification Center).
@@ -14,5 +15,7 @@ export default async function getPresentedNotificationsAsync(): Promise<Notifica
     throw new UnavailabilityError('Notifications', 'getPresentedNotificationsAsync');
   }
 
-  return await NotificationPresenter.getPresentedNotificationsAsync();
+  return (await NotificationPresenter.getPresentedNotificationsAsync()).map((notification) =>
+    mapNotification(notification)
+  );
 }

package/src/utils/mapNotificationResponse.ts

@@ -1,4 +1,9 @@
-import { Notification, NotificationResponse } from '../Notifications.types';
+import {
+  Notification,
+  NotificationContent,
+  NotificationRequest,
+  NotificationResponse,
+} from '../Notifications.types';
 
 /**
  * @hidden
@@ -26,18 +31,43 @@ export const mapNotificationResponse = (response: NotificationResponse) => {
  * @param notification The raw notification passed in from native code
  * @returns the mapped notification.
  */
-export const mapNotification = (notification: Notification) => {
-  const mappedNotification: Notification & {
-    request: { content: { dataString?: string } };
-  } = { ...notification };
+export const mapNotification = (notification: Notification) => ({
+  ...notification,
+  request: mapNotificationRequest(notification.request),
+});
+
+/**
+ * @hidden
+ *
+ * Does any required processing of a notification request from native code
+ * before it is passed to other JS code.
+ *
+ * @param request The raw request passed in from native code
+ * @returns the mapped request.
+ */
+export const mapNotificationRequest = (request: NotificationRequest) => ({
+  ...request,
+  content: mapNotificationContent(request.content),
+});
+
+/**
+ * @hidden
+ * Does any required processing of notification content from native code
+ * before being passed to other JS code.
+ *
+ * @param content The raw content passed in from native code
+ * @returns the mapped content.
+ */
+export const mapNotificationContent = (content: NotificationContent) => {
+  const mappedContent: NotificationContent & { dataString?: string } = { ...content };
   try {
-    const dataString = mappedNotification?.request?.content['dataString'];
+    const dataString = mappedContent['dataString'];
     if (typeof dataString === 'string') {
-      mappedNotification.request.content.data = JSON.parse(dataString);
-      delete mappedNotification.request.content.dataString;
+      mappedContent.data = JSON.parse(dataString);
+      delete mappedContent.dataString;
     }
   } catch (e: any) {
     console.log(`Error in notification: ${e}`);
   }
-  return mappedNotification;
+  return mappedContent;
 };

package/android/src/main/java/expo/modules/notifications/notifications/interfaces/NotificationPresentationEffect.java

@@ -1,11 +0,0 @@
-package expo.modules.notifications.notifications.interfaces;
-
-import android.app.Notification;
-
-import androidx.annotation.Nullable;
-
-public interface NotificationPresentationEffect {
-  boolean onNotificationPresented(@Nullable String tag, int id, Notification notification);
-
-  boolean onNotificationPresentationFailed(@Nullable String tag, int id, Notification notification);
-}

package/android/src/main/java/expo/modules/notifications/notifications/interfaces/NotificationPresentationEffectsManager.java

@@ -1,7 +0,0 @@
-package expo.modules.notifications.notifications.interfaces;
-
-public interface NotificationPresentationEffectsManager extends NotificationPresentationEffect {
-  void addEffect(NotificationPresentationEffect effector);
-
-  void removeEffect(NotificationPresentationEffect effector);
-}

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

@@ -1,61 +0,0 @@
-package expo.modules.notifications.notifications.model.triggers;
-
-import android.os.Build;
-import android.os.Parcel;
-
-import com.google.firebase.messaging.RemoteMessage;
-
-import androidx.annotation.Nullable;
-import androidx.annotation.RequiresApi;
-import expo.modules.notifications.notifications.interfaces.NotificationTrigger;
-
-/**
- * A trigger representing an incoming remote Firebase notification.
- */
-public class FirebaseNotificationTrigger implements NotificationTrigger {
-  private RemoteMessage mRemoteMessage;
-
-  public FirebaseNotificationTrigger(RemoteMessage remoteMessage) {
-    mRemoteMessage = remoteMessage;
-  }
-
-  private FirebaseNotificationTrigger(Parcel in) {
-    mRemoteMessage = in.readParcelable(getClass().getClassLoader());
-  }
-
-  public RemoteMessage getRemoteMessage() {
-    return mRemoteMessage;
-  }
-
-  @Override
-  public int describeContents() {
-    return 0;
-  }
-
-  @Override
-  public void writeToParcel(Parcel dest, int flags) {
-    dest.writeParcelable(mRemoteMessage, 0);
-  }
-
-  public static final Creator<FirebaseNotificationTrigger> CREATOR = new Creator<FirebaseNotificationTrigger>() {
-    @Override
-    public FirebaseNotificationTrigger createFromParcel(Parcel in) {
-      return new FirebaseNotificationTrigger(in);
-    }
-
-    @Override
-    public FirebaseNotificationTrigger[] newArray(int size) {
-      return new FirebaseNotificationTrigger[size];
-    }
-  };
-
-  @Nullable
-  @Override
-  @RequiresApi(api = Build.VERSION_CODES.O)
-  public String getNotificationChannel() {
-    if (getRemoteMessage().getData().containsKey("channelId")) {
-      return getRemoteMessage().getData().get("channelId");
-    }
-    return NotificationTrigger.super.getNotificationChannel();
-  }
-}

package/android/src/main/java/expo/modules/notifications/notifications/presentation/ExpoNotificationPresentationEffectsManager.java

@@ -1,63 +0,0 @@
-package expo.modules.notifications.notifications.presentation;
-
-import android.app.Notification;
-import android.util.Log;
-
-import expo.modules.core.interfaces.InternalModule;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import androidx.annotation.Nullable;
-import expo.modules.notifications.notifications.interfaces.NotificationPresentationEffect;
-import expo.modules.notifications.notifications.interfaces.NotificationPresentationEffectsManager;
-
-public class ExpoNotificationPresentationEffectsManager implements InternalModule, NotificationPresentationEffectsManager {
-  private Collection<NotificationPresentationEffect> mEffects = new ArrayList<>();
-
-  @Override
-  public List<? extends Class> getExportedInterfaces() {
-    return Collections.singletonList(NotificationPresentationEffectsManager.class);
-  }
-
-  @Override
-  public void addEffect(NotificationPresentationEffect effect) {
-    removeEffect(effect);
-    mEffects.add(effect);
-  }
-
-  @Override
-  public void removeEffect(NotificationPresentationEffect effect) {
-    mEffects.remove(effect);
-  }
-
-  @Override
-  public boolean onNotificationPresented(@Nullable String tag, int id, Notification notification) {
-    boolean anyActed = false;
-    for (NotificationPresentationEffect effect : mEffects) {
-      try {
-        anyActed = effect.onNotificationPresented(tag, id, notification) || anyActed;
-      } catch (Exception e) {
-        Log.w("expo-notifications", String.format("Notification presentation effector %s threw an exception for notification (%s, %d): %s", effect.getClass(), tag, id, e.getMessage()));
-        e.printStackTrace();
-      }
-    }
-    return anyActed;
-  }
-
-  @Override
-  public boolean onNotificationPresentationFailed(@Nullable String tag, int id, Notification notification) {
-    boolean anyActed = false;
-    for (NotificationPresentationEffect effect : mEffects) {
-      try {
-        anyActed = effect.onNotificationPresentationFailed(tag, id, notification) || anyActed;
-      } catch (Exception e) {
-        Log.w("expo-notifications", String.format("Notification presentation effector %s threw an exception for notification (%s, %d): %s", effect.getClass(), tag, id, e.getMessage()));
-        e.printStackTrace();
-      }
-    }
-    return anyActed;
-  }
-}

package/android/src/main/java/expo/modules/notifications/notifications/presentation/effects/BaseNotificationEffect.java

@@ -1,53 +0,0 @@
-package expo.modules.notifications.notifications.presentation.effects;
-
-import android.app.Notification;
-import android.content.Context;
-
-import expo.modules.core.ModuleRegistry;
-import expo.modules.core.interfaces.InternalModule;
-
-import java.util.Collections;
-import java.util.List;
-
-import androidx.annotation.Nullable;
-import expo.modules.notifications.notifications.interfaces.NotificationPresentationEffect;
-import expo.modules.notifications.notifications.interfaces.NotificationPresentationEffectsManager;
-
-public abstract class BaseNotificationEffect implements InternalModule, NotificationPresentationEffect {
-  private Context mContext;
-  private NotificationPresentationEffectsManager mManager;
-
-  public BaseNotificationEffect(Context context) {
-    mContext = context;
-  }
-
-  protected Context getContext() {
-    return mContext;
-  }
-
-  @Override
-  public List<? extends Class> getExportedInterfaces() {
-    return Collections.singletonList(getClass());
-  }
-
-  @Override
-  public void onCreate(ModuleRegistry moduleRegistry) {
-    mManager = moduleRegistry.getModule(NotificationPresentationEffectsManager.class);
-    mManager.addEffect(this);
-  }
-
-  @Override
-  public void onDestroy() {
-    mManager.removeEffect(this);
-  }
-
-  @Override
-  public boolean onNotificationPresented(@Nullable String tag, int id, Notification notification) {
-    return false;
-  }
-
-  @Override
-  public boolean onNotificationPresentationFailed(@Nullable String tag, int id, Notification notification) {
-    return false;
-  }
-}