expo-notifications 0.28.14 → 0.28.15

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 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.15'
 
 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.15'
   }
 
   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;
 
@@ -58,8 +60,7 @@ public class NotificationSerializer {
     serializedRequest.putBundle("trigger", toBundle(request.getTrigger()));
     Bundle content = toBundle(request.getContent());
     Bundle existingContentData = content.getBundle("data");
-    if (existingContentData == null) {
-      FirebaseNotificationTrigger trigger = (FirebaseNotificationTrigger) request.getTrigger();
+    if (existingContentData == null && request.getTrigger() instanceof FirebaseNotificationTrigger trigger) {
       RemoteMessage message = trigger.getRemoteMessage();
       RemoteMessage.Notification notification = message.getNotification();
       Map<String, String> data = message.getData();
@@ -226,17 +227,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 +260,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-notifications",
-  "version": "0.28.14",
+  "version": "0.28.15",
   "description": "Notifications module",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -55,5 +55,5 @@
   "peerDependencies": {
     "expo": "*"
   },
-  "gitHead": "10eaf729822bf46ab821a000eb961cf8df40b35b"
+  "gitHead": "760c0c1a3bebcedc19836db8bc98c737f0db8c8d"
 }