Added channel_id to Messaging notifications.

PiperOrigin-RevId: 250583162

Author: amablue

messaging/src/android/cpp/message_reader.cc

@@ -109,6 +109,7 @@ void MessageReader::ConsumeMessage(
     const SerializedMessage* serialized_message) const {
   Message message;
   Notification notification;
+  AndroidNotificationParams android;
   message.from = SafeFlatbufferString(serialized_message->from());
   message.to = SafeFlatbufferString(serialized_message->to());
   if (serialized_message->data()) {
@@ -171,18 +172,24 @@ void MessageReader::ConsumeMessage(
             serialized_notification->title_loc_args()->Get(i));
       }
     }
+    android.channel_id =
+        SafeFlatbufferString(serialized_notification->android_channel_id());
 
     // The notification has been allocated on the stack for speed. Set this
     // pointer to null before the notification leaves scope or it will be
     // deleted.
+    notification.android = &android;
     message.notification = &notification;
   }
 
   // Finally, process the message.
   message_callback_(message, message_callback_data_);
   // Ensure that the stack allocated pointer is null before it goes out of
   // scope so it doesn't get deleted.
-  message.notification = nullptr;
+  if (message.notification) {
+    message.notification->android = nullptr;
+    message.notification = nullptr;
+  }
 }
 
 // Convert the SerializedTokenReceived to a token and calls the registered

messaging/src/android/java/com/google/firebase/messaging/cpp/MessageWriter.java

@@ -243,6 +243,7 @@ private static byte[] generateMessageByteBuffer(
       int tagOffset = builder.createString(emptyIfNull(notification.getTag()));
       int colorOffset = builder.createString(emptyIfNull(notification.getColor()));
       int clickActionOffset = builder.createString(emptyIfNull(notification.getClickAction()));
+      int androidChannelIdOffset = builder.createString(emptyIfNull(notification.getChannelId()));
       int bodyLocalizationKeyOffset =
           builder.createString(emptyIfNull(notification.getBodyLocalizationKey()));
       int bodyLocalizationArgsOffset = 0;
@@ -278,6 +279,7 @@ private static byte[] generateMessageByteBuffer(
       SerializedNotification.addTag(builder, tagOffset);
       SerializedNotification.addColor(builder, colorOffset);
       SerializedNotification.addClickAction(builder, clickActionOffset);
+      SerializedNotification.addAndroidChannelId(builder, androidChannelIdOffset);
       SerializedNotification.addBodyLocKey(builder, bodyLocalizationKeyOffset);
       SerializedNotification.addBodyLocArgs(builder, bodyLocalizationArgsOffset);
       SerializedNotification.addTitleLocKey(builder, titleLocalizationKeyOffset);

messaging/src/android/schemas/messaging.fbs

@@ -102,6 +102,9 @@ table SerializedNotification {
   //
   // [1]: https://developer.android.com/guide/topics/resources/string-resource.html#FormattingAndStyling
   title_loc_args:[string];
+
+  // The channel id that was provided when the message was sent.
+  android_channel_id:string;
 }
 
 table SerializedMessage {
@@ -205,15 +208,14 @@ table SerializedMessage {
   // system tray of the OS.
   notification_opened:bool;
 
-  /// The link into the app from the message in the form of a URL.
+  // The link into the app from the message in the form of a URL.
   link:string;
 
   // Time in milliseconds from the Linux Epoch that the message was sent.
   sent_time:long;
 
   // Original priority of the message.  Value values are "normal" and "high".
   //
-  //
   // For more information, see Setting the priority of a message.
   original_priority:string;
 }

messaging/src/include/firebase/messaging.h

@@ -61,11 +61,52 @@ struct MessagingOptions {
   bool suppress_notification_permission_prompt;
 };
 
+/// @brief Data structure for parameters that are unique to the Android
+/// implementation.
+struct AndroidNotificationParams {
+  /// The channel id that was provided when the message was sent.
+  std::string channel_id;
+};
+
 /// Used for messages that display a notification.
 ///
 /// On android, this requires that the app is using the Play Services client
 /// library.
 struct Notification {
+  Notification() : android(nullptr) {}
+
+#ifndef SWIG
+  /// Copy constructor. Makes a deep copy of this Message.
+  Notification(const Notification& other) : android(nullptr) { *this = other; }
+#endif  // !SWIG
+
+#ifndef SWIG
+  /// Copy assignment operator. Makes a deep copy of this Message.
+  Notification& operator=(const Notification& other) {
+    this->title = other.title;
+    this->body = other.body;
+    this->icon = other.icon;
+    this->sound = other.sound;
+    this->tag = other.tag;
+    this->color = other.color;
+    this->click_action = other.click_action;
+    this->body_loc_key = other.body_loc_key;
+    this->body_loc_args = other.body_loc_args;
+    this->title_loc_key = other.title_loc_key;
+    this->title_loc_args = other.title_loc_args;
+    delete this->android;
+    if (other.android) {
+      this->android = new AndroidNotificationParams(*other.android);
+    } else {
+      this->android = nullptr;
+    }
+    return *this;
+  }
+#endif  // !SWIG
+
+  /// Destructor.
+  ~Notification() { delete android; }
+
   /// Indicates notification title. This field is not visible on iOS phones
   /// and tablets.
   std::string title;
@@ -146,6 +187,9 @@ struct Notification {
   /// [1]:
   /// https://developer.android.com/guide/topics/resources/string-resource.html#FormattingAndStyling
   std::vector<std::string> title_loc_args;
+
+  /// Parameters that are unique to the Android implementation.
+  AndroidNotificationParams* android;
 };
 
 /// @brief Data structure used to send messages to, and receive messages from,