expo-notifications 0.28.14 → 0.28.16

package/CHANGELOG.md

@@ -10,6 +10,18 @@
 
 ### 💡 Others
 
+## 0.28.16 — 2024-08-21
+
+### 🐛 Bug fixes
+
+- [Android] Fix content.data in scheduled notifications surfaced to JS. ([#31048](https://github.com/expo/expo/pull/31048) by [@douglowder](https://github.com/douglowder))
+
+## 0.28.15 — 2024-08-05
+
+### 🐛 Bug fixes
+
+- [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))
+
 ## 0.28.14 — 2024-07-30
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '0.28.14'
+version = '0.28.16'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -14,7 +14,7 @@ android {
   namespace "expo.modules.notifications"
   defaultConfig {
     versionCode 21
-    versionName '0.28.14'
+    versionName '0.28.16'
   }
 
   buildFeatures {

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

@@ -3,8 +3,13 @@ package expo.modules.notifications
 import android.os.Bundle
 import android.os.Handler
 import android.os.ResultReceiver
+import expo.modules.kotlin.types.JSTypeConverter
+import org.json.JSONArray
+import org.json.JSONException
+import org.json.JSONObject
 
 typealias ResultReceiverBody = (resultCode: Int, resultData: Bundle?) -> Unit
+typealias BundleConversionTester = (bundle: Bundle) -> Boolean
 
 internal fun createDefaultResultReceiver(
   handler: Handler?,
@@ -17,3 +22,87 @@ internal fun createDefaultResultReceiver(
     }
   }
 }
+
+/**
+ * Given an input bundle, creates a new bundle with non-convertible objects removed
+ */
+internal fun filteredBundleForJSTypeConverter(bundle: Bundle): Bundle {
+  return filteredBundleForJSTypeConverter(bundle, isBundleConvertibleToJSValue)
+}
+
+internal fun filteredBundleForJSTypeConverter(bundle: Bundle, testBundle: BundleConversionTester): Bundle {
+  return when (testBundle(bundle)) {
+    true -> bundle
+    else -> {
+      // Store keys whose values are convertible
+      val goodKeys: MutableSet<String> = mutableSetOf()
+      // Do first pass to filter any values that are bundles
+      bundle.keySet().forEach { key: String ->
+        val value = bundle[key]
+        if (value is Bundle) {
+          bundle.putBundle(key, filteredBundleForJSTypeConverter(value, testBundle))
+          goodKeys.add(key)
+        }
+      }
+      // Second pass: create a bundle with just the value for that key, and see if it converts
+      // There is no generic put() method for bundles, so we putAll() and then remove values
+      // other than the one we are testing
+      bundle.keySet().forEach { key: String ->
+        if (!goodKeys.contains(key)) {
+          val test = Bundle()
+          test.putAll(bundle)
+          bundle.keySet().forEach { otherKey: String ->
+            if (!otherKey.equals(key)) {
+              test.remove(otherKey)
+            }
+          }
+          if (testBundle(test)) {
+            goodKeys.add(key)
+          }
+        }
+      }
+      // Now create a new bundle, remove keys that are not good, and return
+      val result = Bundle()
+      result.putAll(bundle)
+      bundle.keySet().forEach { key: String ->
+        if (!goodKeys.contains(key)) {
+          result.remove(key)
+        }
+      }
+      result
+    }
+  }
+}
+
+internal val isBundleConvertibleToJSValue: BundleConversionTester = { bundle: Bundle ->
+  try {
+    JSTypeConverter.convertToJSValue(bundle)
+    true
+  } catch (e: Throwable) {
+    false
+  }
+}
+
+/**
+ * Returns true if the argument is a valid JSON string, false otherwise
+ */
+internal fun isValidJSONString(test: Any?): Boolean {
+  when (test is String) {
+    true -> {
+      try {
+        JSONObject(test as String)
+        return true
+      } catch (objectEx: JSONException) {
+        try {
+          JSONArray(test as String)
+          return true
+        } catch (arrayEx: JSONException) {
+          return false
+        }
+      }
+    }
+    else -> {
+      return false
+    }
+  }
+}

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

@@ -1,5 +1,8 @@
 package expo.modules.notifications.notifications;
 
+import static expo.modules.notifications.UtilsKt.filteredBundleForJSTypeConverter;
+import static expo.modules.notifications.UtilsKt.isValidJSONString;
+
 import android.os.Build;
 import android.os.Bundle;
 
@@ -9,7 +12,6 @@ import com.google.firebase.messaging.RemoteMessage;
 
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONArray;
-import org.json.JSONException;
 import org.json.JSONObject;
 import expo.modules.core.arguments.MapArguments;
 
@@ -21,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;
@@ -59,19 +62,26 @@ public class NotificationSerializer {
     Bundle content = toBundle(request.getContent());
     Bundle existingContentData = content.getBundle("data");
     if (existingContentData == null) {
-      FirebaseNotificationTrigger trigger = (FirebaseNotificationTrigger) request.getTrigger();
-      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(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) {
+        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);
@@ -226,17 +236,17 @@ public class NotificationSerializer {
     Bundle serializedContent = new Bundle();
     serializedContent.putString("title", extras.getString("title"));
     String body = extras.getString("body");
-    String projectId = extras.getString("projectId");
-    if (projectId != null && isValidJSONString(body) ) {
-      // If projectId is set in the bundle, and the body is a JSON string,
+    if (isValidJSONString(body) ) {
+      // If the body is a JSON string,
       // the notification was sent by the Expo notification service,
       // so we do the expected remapping of fields
       serializedContent.putString("dataString", body);
       serializedContent.putString("body", extras.getString("message"));
     } else {
       // The notification came directly from Firebase or some other service,
-      // so we copy the data as is from the extras bundle
-      serializedContent.putBundle("data", extras);
+      // so we copy the data as is from the extras bundle, after
+      // ensuring it can be converted for emitting to JS
+      serializedContent.putBundle("data", filteredBundleForJSTypeConverter(extras));
     }
 
     Bundle serializedTrigger = new Bundle();
@@ -259,17 +269,4 @@ public class NotificationSerializer {
     return serializedResponse;
   }
 
-  public static boolean isValidJSONString(String test) {
-    try {
-      new JSONObject(test);
-    } catch (JSONException objectEx) {
-      try {
-        new JSONArray(test);
-      } catch (JSONException arrayEx) {
-        return false;
-      }
-    }
-    return true;
-  }
-
 }

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": "0.28.14",
+  "version": "0.28.16",
   "description": "Notifications module",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -55,5 +55,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "10eaf729822bf46ab821a000eb961cf8df40b35b"
+  "gitHead": "a9cfcf600ccaf5122932629472eb3bb2adb941fe"
 }

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;
 };