expo-notifications 1.0.0-canary-20241021-7aba813 → 1.0.0-canary-20241021-c4b5a93

package/CHANGELOG.md

@@ -14,6 +14,7 @@
 
 ### 🐛 Bug fixes
 
+- [android] fix: allow data message to control notification appearance ([#32162](https://github.com/expo/expo/pull/32162) by [@vonovak](https://github.com/vonovak))
 - [ios] fix crash if expo-update reload happens while Notifications.requestPermissionsAsync() is showing native dialog ([#32096](https://github.com/expo/expo/pull/32096) by [@mfazekas](https://github.com/mfazekas))
 - [android] `createNotificationChannel` could return incorrect channel information ([#32000](https://github.com/expo/expo/pull/32000) by [@vonovak](https://github.com/vonovak))
 - [android] fix notifications with `ChannelAwareTrigger` not being presented ([#31999](https://github.com/expo/expo/pull/31999) by [@vonovak](https://github.com/vonovak))

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

@@ -0,0 +1,69 @@
+package expo.modules.notifications.notifications.model
+
+import org.json.JSONArray
+import org.json.JSONObject
+
+/*
+* In some scenarios, data-only push notifications are, in fact, presented.
+* The presentation preferences are taken from the data payload.
+*
+* https://docs.expo.dev/versions/latest/sdk/notifications/#android-push-notification-payload-specification
+* */
+@JvmInline
+value class NotificationData(private val data: Map<String, String>) {
+  val title: String?
+    get() = data["title"]
+
+  val message: String?
+    get() = data["message"]
+
+  val body: JSONObject?
+    get() = try {
+      data["body"]?.let { JSONObject(it) }
+    } catch (e: Exception) {
+      null
+    }
+
+  val sound: String?
+    get() = data["sound"]
+
+  val shouldPlayDefaultSound: Boolean
+    get() = sound == null
+
+  val shouldUseDefaultVibrationPattern: Boolean
+    get() = data["vibrate"]?.toBoolean() == true
+
+  val isSticky: Boolean
+    get() = data["sticky"]?.toBoolean() ?: false
+
+  val vibrationPattern: LongArray?
+    get() = try {
+      data["vibrate"]?.let { vibrateString ->
+        JSONArray(vibrateString).let { jsonArray ->
+          LongArray(jsonArray.length()) { i ->
+            jsonArray.getLong(i)
+          }
+        }
+      }
+    } catch (e: Exception) {
+      // most likely a boolean value that cannot be converted to a longArray
+      null
+    }
+
+  val color: String? get() = data["color"]
+
+  val autoDismiss: Boolean
+    get() = data["autoDismiss"]?.toBoolean() ?: true
+
+  val categoryId: String?
+    get() = data["categoryId"]
+
+  val sticky: Boolean
+    get() = data["sticky"]?.toBoolean() ?: false
+
+  val subText: String?
+    get() = data["subtitle"]
+
+  val badge: Int?
+    get() = data["badge"]?.toIntOrNull()
+}

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

@@ -8,7 +8,6 @@ import com.google.firebase.messaging.RemoteMessage
 import expo.modules.notifications.notifications.enums.NotificationPriority
 import expo.modules.notifications.notifications.interfaces.INotificationContent
 import expo.modules.notifications.notifications.presentation.builders.downloadImage
-import org.json.JSONObject
 
 /**
  * A POJO representing a remote notification content: title, message, body, etc.
@@ -21,6 +20,8 @@ class RemoteNotificationContent(private val remoteMessage: RemoteMessage) : INot
 
   constructor(parcel: Parcel) : this(parcel.readParcelable<RemoteMessage>(RemoteMessage::class.java.classLoader)!!)
 
+  private val notificationData = NotificationData(remoteMessage.data)
+
   override suspend fun getImage(context: Context): Bitmap? {
     val uri = remoteMessage.notification?.imageUrl
     return uri?.let { downloadImage(it) }
@@ -30,30 +31,20 @@ class RemoteNotificationContent(private val remoteMessage: RemoteMessage) : INot
     return remoteMessage.notification?.imageUrl != null
   }
 
-  override val title: String?
-    get() = remoteMessage.notification?.title
+  override val title = remoteMessage.notification?.title ?: notificationData.title
 
-  override val text: String?
-    get() = remoteMessage.notification?.body
+  override val text = remoteMessage.notification?.body ?: notificationData.message
 
-  override val shouldPlayDefaultSound: Boolean
-    get() = remoteMessage.notification?.sound == null
+  override val shouldPlayDefaultSound = remoteMessage.notification?.sound == null && notificationData.shouldPlayDefaultSound
 
-  override val soundName: String?
-    get() = remoteMessage.notification?.sound
+  override val soundName = remoteMessage.notification?.sound ?: notificationData.sound
 
   override val shouldUseDefaultVibrationPattern: Boolean
-    get() = remoteMessage.notification?.defaultVibrateSettings == true
+    get() = remoteMessage.notification?.defaultVibrateSettings ?: notificationData.shouldUseDefaultVibrationPattern
 
-  override val vibrationPattern: LongArray?
-    get() = remoteMessage.notification?.vibrateTimings
+  override val vibrationPattern = remoteMessage.notification?.vibrateTimings ?: notificationData.vibrationPattern
 
-  override val body: JSONObject?
-    get() = try {
-      remoteMessage.data["body"]?.let { JSONObject(it) }
-    } catch (e: Exception) {
-      null
-    }
+  override val body = notificationData.body
 
   override val priority: NotificationPriority
     get() = when (remoteMessage.priority) {
@@ -62,24 +53,23 @@ class RemoteNotificationContent(private val remoteMessage: RemoteMessage) : INot
     }
 
   override val color: Number?
-    get() = remoteMessage.notification?.color?.let { android.graphics.Color.parseColor(it) }
+    get() {
+      val colorSource = remoteMessage.notification?.color ?: notificationData.color
+      return colorSource?.let { android.graphics.Color.parseColor(it) }
+    }
 
   // NOTE the following getter functions are here because the local notification content class has them
-  // and this class conforms to the same interface. They are not supported by FCM.
-  override val isAutoDismiss: Boolean
-    get() = remoteMessage.data["autoDismiss"]?.toBoolean() ?: true
+  // and this class conforms to the same interface.
+  // They are not supported by FCM but were previously implemented by JSONNotificationContentBuilder.java.
+  override val isAutoDismiss = notificationData.autoDismiss
 
-  override val categoryId: String?
-    get() = remoteMessage.data["categoryId"]
+  override val categoryId = notificationData.categoryId
 
-  override val isSticky: Boolean
-    get() = remoteMessage.data["sticky"]?.toBoolean() ?: false
+  override val isSticky = notificationData.isSticky
 
-  override val subText: String?
-    get() = remoteMessage.data["subtitle"]
+  override val subText = notificationData.subText
 
-  override val badgeCount: Number?
-    get() = remoteMessage.data["badge"]?.toIntOrNull()
+  override val badgeCount = notificationData.badge
 
   override fun describeContents(): Int = 0
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-notifications",
-  "version": "1.0.0-canary-20241021-7aba813",
+  "version": "1.0.0-canary-20241021-c4b5a93",
   "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,25 +38,25 @@
     "preset": "expo-module-scripts/ios"
   },
   "dependencies": {
-    "@expo/image-utils": "0.6.0-canary-20241021-7aba813",
+    "@expo/image-utils": "0.6.0-canary-20241021-c4b5a93",
     "@ide/backoff": "^1.0.0",
     "abort-controller": "^3.0.0",
     "assert": "^2.0.0",
     "badgin": "^1.1.5",
-    "expo-application": "6.0.0-canary-20241021-7aba813",
-    "expo-constants": "17.0.0-canary-20241021-7aba813",
+    "expo-application": "6.0.0-canary-20241021-c4b5a93",
+    "expo-constants": "17.0.0-canary-20241021-c4b5a93",
     "fs-extra": "^9.1.0"
   },
   "devDependencies": {
     "@types/node-fetch": "^2.5.7",
-    "expo-module-scripts": "3.6.0-canary-20241021-7aba813",
+    "expo-module-scripts": "3.6.0-canary-20241021-c4b5a93",
     "memfs": "^3.2.0",
     "node-fetch": "^2.6.7"
   },
   "peerDependencies": {
-    "expo": "52.0.0-canary-20241021-7aba813",
+    "expo": "52.0.0-canary-20241021-c4b5a93",
     "react": "*",
     "react-native": "*"
   },
-  "gitHead": "7aba81347da9d958c517e17a045f015871bbe3b3"
+  "gitHead": "c4b5a932011f3dfab7a0302ff32cce7c33aa7c28"
 }