[Messaging] Format '/topics/all' is deprecated #883

Author: EddyVerbruggen

src/messaging/messaging.android.ts

@@ -139,9 +139,13 @@ export function subscribeToTopic(topicName) {
         return;
       }
 
-      // TODO since Cloud Messaging 17.0.0 this returns a Task instead of void (so we can resolve onSuccess)
-      com.google.firebase.messaging.FirebaseMessaging.getInstance().subscribeToTopic(topicName);
-      resolve();
+      const onCompleteListener = new com.google.android.gms.tasks.OnCompleteListener({
+        onComplete: task => task.isSuccessful() ? resolve() : reject(task.getException() && task.getException().getReason ? task.getException().getReason() : task.getException())
+      });
+
+      com.google.firebase.messaging.FirebaseMessaging.getInstance()
+          .subscribeToTopic(topicName)
+          .addOnCompleteListener(onCompleteListener);
     } catch (ex) {
       console.log("Error in firebase.subscribeToTopic: " + ex);
       reject(ex);
@@ -158,8 +162,13 @@ export function unsubscribeFromTopic(topicName) {
         return;
       }
 
-      com.google.firebase.messaging.FirebaseMessaging.getInstance().unsubscribeFromTopic(topicName);
-      resolve();
+      const onCompleteListener = new com.google.android.gms.tasks.OnCompleteListener({
+        onComplete: task => task.isSuccessful() ? resolve() : reject(task.getException() && task.getException().getReason ? task.getException().getReason() : task.getException())
+      });
+
+      com.google.firebase.messaging.FirebaseMessaging.getInstance()
+          .unsubscribeFromTopic(topicName)
+          .addOnCompleteListener(onCompleteListener);
     } catch (ex) {
       console.log("Error in firebase.unsubscribeFromTopic: " + ex);
       reject(ex);

src/messaging/messaging.ios.ts

@@ -216,13 +216,9 @@ export function subscribeToTopic(topicName) {
         return;
       }
 
-      if (topicName.indexOf("/topics/") === -1) {
-        topicName = "/topics/" + topicName;
-      }
-
-      // TODO there's also (un)subscribeToTopicCompletion (resolve when completed).. perhaps this has been added to Android as well
-      FIRMessaging.messaging().subscribeToTopic(topicName);
-      resolve();
+      FIRMessaging.messaging().subscribeToTopicCompletion(topicName, (error: NSError) => {
+        error ? reject(error.localizedDescription) : resolve();
+      });
     } catch (ex) {
       console.log("Error in firebase.subscribeToTopic: " + ex);
       reject(ex);
@@ -239,11 +235,9 @@ export function unsubscribeFromTopic(topicName) {
         return;
       }
 
-      if (topicName.indexOf("/topics/") === -1) {
-        topicName = "/topics/" + topicName;
-      }
-      FIRMessaging.messaging().unsubscribeFromTopic(topicName);
-      resolve();
+      FIRMessaging.messaging().unsubscribeFromTopicCompletion(topicName, error => {
+        error ? reject(error.localizedDescription) : resolve();
+      });
     } catch (ex) {
       console.log("Error in firebase.unsubscribeFromTopic: " + ex);
       reject(ex);