From 4ccc5e59026b4eb1d09aae985a89b1d812528146 Mon Sep 17 00:00:00 2001
From: Greg Sakakihara <gsaka@google.com>
Date: Wed, 13 Nov 2024 08:41:13 -0800
Subject: [PATCH] Update upstream methods to indicate they are now
 decommissioned.

---
 firebase-messaging/CHANGELOG.md                             | 3 ++-
 .../com/google/firebase/messaging/FirebaseMessaging.java    | 3 ++-
 .../google/firebase/messaging/FirebaseMessagingService.java | 6 ++++--
 .../java/com/google/firebase/messaging/RemoteMessage.java   | 3 ++-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/firebase-messaging/CHANGELOG.md b/firebase-messaging/CHANGELOG.md
index c34f8b298398..4bf7a106c1ca 100644
--- a/firebase-messaging/CHANGELOG.md
+++ b/firebase-messaging/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Unreleased
-* [deprecated] Deprecated additional FCM upstream messaging methods. See the
+* [deprecated] Deprecated additional FCM upstream messaging methods and updated
+  all upstream methods to indicate they are now decommissioned. See the
   [FAQ](https://firebase.google.com/support/faq#fcm-23-deprecation) for more
   details.
 * [changed] Changed WithinAppServiceConnection's ScheduledThreadPoolExecutor's
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java
index 454fae7be097..afba6e2f25c2 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessaging.java
@@ -514,7 +514,8 @@ public Task<Void> unsubscribeFromTopic(@NonNull String topic) {
    * <p>When there is an active connection the message will be sent immediately, otherwise the
    * message will be queued up to the time to live (TTL) set in the message.
    *
-   * @deprecated FCM upstream messaging is decommissioned. Learn more in the
+   * @deprecated This function is actually <strong>decommissioned</strong> along with all of FCM
+   * upstream messaging. Learn more in the
    * <a href="https://firebase.google.com/support/faq#fcm-23-deprecation">FAQ about FCM features
    * deprecated in June 2023</a>.
    */
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java
index 621e943c4809..c3cf62dffaf1 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/FirebaseMessagingService.java
@@ -127,7 +127,8 @@ public void onDeletedMessages() {}
    *
    * @param msgId of the upstream message sent using {@link FirebaseMessaging#send}.
    *
-   * @deprecated FCM upstream messaging is decommissioned. Learn more in the
+   * @deprecated This function is actually <strong>decommissioned</strong> along with all of FCM
+   * upstream messaging. Learn more in the
    * <a href="https://firebase.google.com/support/faq#fcm-23-deprecation">FAQ about FCM features
    * deprecated in June 2023</a>.
    */
@@ -141,7 +142,8 @@ public void onMessageSent(@NonNull String msgId) {}
    * @param msgId of the upstream message sent using {@link FirebaseMessaging#send}.
    * @param exception description of the error, typically a {@link SendException}.
    *
-   * @deprecated FCM upstream messaging is decommissioned. Learn more in the
+   * @deprecated This function is actually <strong>decommissioned</strong> along with all of FCM
+   * upstream messaging. Learn more in the
    * <a href="https://firebase.google.com/support/faq#fcm-23-deprecation">FAQ about FCM features
    * deprecated in June 2023</a>.
    */
diff --git a/firebase-messaging/src/main/java/com/google/firebase/messaging/RemoteMessage.java b/firebase-messaging/src/main/java/com/google/firebase/messaging/RemoteMessage.java
index 4dd998a30405..77446191b24e 100644
--- a/firebase-messaging/src/main/java/com/google/firebase/messaging/RemoteMessage.java
+++ b/firebase-messaging/src/main/java/com/google/firebase/messaging/RemoteMessage.java
@@ -110,7 +110,8 @@ public String getFrom() {
   /**
    * Gets the message destination.
    *
-   * @deprecated FCM upstream messaging is decommissioned. Learn more in the
+   * @deprecated This function is actually <strong>decommissioned</strong> along with all of FCM
+   * upstream messaging. Learn more in the
    * <a href="https://firebase.google.com/support/faq#fcm-23-deprecation">FAQ about FCM features
    * deprecated in June 2023</a>.
    */