Subscribe and Unsubscribe will now return a Future that contains an error

instead of never completing when TokenRegistrationOnInitEnabled is set to
false.

PiperOrigin-RevId: 246360447

Author: amablue

messaging/src/android/cpp/messaging.cc

@@ -324,7 +324,7 @@ Future<void> RequestPermission() {
   SafeFutureHandle<void> handle =
       api->SafeAlloc<void>(kMessagingFnRequestPermission);
   api->Complete(handle, kErrorNone);
-  return Future<void>(api, handle.get());
+  return MakeFuture(api, handle);
 }
 
 Future<void> RequestPermissionLastResult() {
@@ -886,6 +886,10 @@ static void HandlePendingSubscriptions() {
   }
 }
 
+static const char kErrorMessageNoRegistrationToken[] =
+    "Cannot update subscription when SetTokenRegistrationOnInitEnabled is set "
+    "to false.";
+
 Future<void> Subscribe(const char* topic) {
   FIREBASE_ASSERT_MESSAGE_RETURN(Future<void>(), internal::IsInitialized(),
                                  kMessagingNotInitializedError);
@@ -894,10 +898,14 @@ Future<void> Subscribe(const char* topic) {
   SafeFutureHandle<void> handle = api->SafeAlloc<void>(kMessagingFnSubscribe);
   if (g_registration_token_received) {
     SubscribeInternal(topic, handle);
+  } else if (g_registration_token_request_state ==
+             kRegistrationTokenRequestStateDisable) {
+    api->Complete(handle, kErrorNoRegistrationToken,
+                  kErrorMessageNoRegistrationToken);
   } else if (g_pending_subscriptions) {
     g_pending_subscriptions->push_back(PendingTopic(topic, handle));
   }
-  return Future<void>(api, handle.get());
+  return MakeFuture(api, handle);
 }
 
 Future<void> SubscribeLastResult() {
@@ -915,10 +923,14 @@ Future<void> Unsubscribe(const char* topic) {
   SafeFutureHandle<void> handle = api->SafeAlloc<void>(kMessagingFnSubscribe);
   if (g_registration_token_received) {
     UnsubscribeInternal(topic, handle);
+  } else if (g_registration_token_request_state ==
+             kRegistrationTokenRequestStateDisable) {
+    api->Complete(handle, kErrorNoRegistrationToken,
+                  kErrorMessageNoRegistrationToken);
   } else if (g_pending_unsubscriptions) {
     g_pending_unsubscriptions->push_back(PendingTopic(topic, handle));
   }
-  return Future<void>(api, handle.get());
+  return MakeFuture(api, handle);
 }
 
 Future<void> UnsubscribeLastResult() {

messaging/src/include/firebase/messaging.h

@@ -16,9 +16,11 @@
 #define FIREBASE_MESSAGING_CLIENT_CPP_INCLUDE_FIREBASE_MESSAGING_H_
 
 #include <stdint.h>
+
 #include <map>
 #include <string>
 #include <vector>
+
 #include "firebase/app.h"
 #include "firebase/future.h"
 #include "firebase/internal/common.h"
@@ -486,6 +488,8 @@ enum Error {
   kErrorFailedToRegisterForRemoteNotifications,
   /// Topic name is invalid for subscription/unsubscription.
   kErrorInvalidTopicName,
+  /// Could not subscribe/unsubscribe because there is no registration token.
+  kErrorNoRegistrationToken,
   /// Unknown error.
   kErrorUnknown,
 };

messaging/src/ios/messaging.mm

@@ -239,7 +239,7 @@ void NotifyListenerSet(Listener* listener) {
       g_launch_notification = nil;
     }
   });
-  return RequestPermissionLastResult();
+  return MakeFuture(api, g_permission_prompt_future_handle);
 }
 
 Future<void> RequestPermissionLastResult() {
@@ -620,6 +620,9 @@ void Send(const Message &message) {
                              timeToLive:message.time_to_live];
 }
 
+static const char kErrorMessageNoRegistrationToken[] =
+    "Cannot update subscritption when SetTokenRegistrationOnInitEnabled is set to false";
+
 Future<void> Subscribe(const char *topic) {
   FIREBASE_ASSERT_RETURN(Future<void>(), internal::IsInitialized());
 
@@ -628,12 +631,18 @@ void Send(const Message &message) {
   SafeFutureHandle<void> handle = api->SafeAlloc<void>(kMessagingFnSubscribe);
 
   LogInfo("FCM: Subscribe to topic `%s`", topic);
+
+  if (!IsTokenRegistrationOnInitEnabled()) {
+    api->Complete(handle, kErrorNoRegistrationToken,
+                  kErrorMessageNoRegistrationToken);
+    return MakeFuture(api, handle);
+  }
   if (![FIRMessaging normalizeTopic:@(topic)]) {
     std::string error = "Cannot parse topic name ";
     error += topic;
     error += ". Will not subscribe.";
     api->Complete(handle, kErrorInvalidTopicName, error.c_str());
-    return Future<void>(api, handle.get());
+    return MakeFuture(api, handle);
   }
   [[FIRMessaging messaging] subscribeToTopic:@(topic)
                                   completion:^void(NSError *error) {
@@ -643,7 +652,7 @@ void Send(const Message &message) {
           api->Complete(handle, kErrorNone);
         }
       }];
-  return Future<void>(api, handle.get());
+  return MakeFuture(api, handle);
 }
 
 Future<void> SubscribeLastResult() {
@@ -661,12 +670,18 @@ void Send(const Message &message) {
   SafeFutureHandle<void> handle = api->SafeAlloc<void>(kMessagingFnUnsubscribe);
 
   LogInfo("FCM: Unsubscribe to topic `%s`", topic);
+
+  if (!IsTokenRegistrationOnInitEnabled()) {
+    api->Complete(handle, kErrorNoRegistrationToken,
+                  kErrorMessageNoRegistrationToken);
+    return MakeFuture(api, handle);
+  }
   if (![FIRMessaging normalizeTopic:@(topic)]) {
     std::string error = "Cannot parse topic name ";
     error += topic;
     error += ". Will not unsubscribe.";
     api->Complete(handle, kErrorInvalidTopicName, error.c_str());
-    return Future<void>(api, handle.get());
+    return MakeFuture(api, handle);
   }
   [[FIRMessaging messaging] unsubscribeFromTopic:@(topic)
                                       completion:^void(NSError *error) {
@@ -676,7 +691,7 @@ void Send(const Message &message) {
           api->Complete(handle, kErrorNone);
         }
       }];
-  return Future<void>(api, handle.get());
+  return MakeFuture(api, handle);
 }
 
 Future<void> UnsubscribeLastResult() {