From e7ac97bdd8c158f50937d070e2d5965fa1ee7e2a Mon Sep 17 00:00:00 2001
From: Simon MacDonald <simon.macdonald@gmail.com>
Date: Thu, 15 Dec 2016 15:48:11 -0500
Subject: [PATCH] :bug::apple: Issue #1461: App crashes when initialising with
 topics (v2.0.0-rc1)

---
 src/ios/PushPlugin.m | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ios/PushPlugin.m b/src/ios/PushPlugin.m
index 30a46fa1c..b5d42f9b4 100644
--- a/src/ios/PushPlugin.m
+++ b/src/ios/PushPlugin.m
@@ -63,7 +63,7 @@ -(void)initRegistration;
         if (topics != nil) {
             for (NSString *topic in topics) {
                 NSLog(@"subscribe from topic: %@", topic);
-                id pubSub = [FIRInstanceID instanceID];
+                id pubSub = [FIRMessaging messaging];
                 [pubSub subscribeToTopic:[NSString stringWithFormat:@"/topics/%@", topic]];
             }
         }
@@ -112,7 +112,7 @@ - (void)unregister:(CDVInvokedUrlCommand*)command;
     NSArray* topics = [command argumentAtIndex:0];
 
     if (topics != nil) {
-        id pubSub = [FIRInstanceID instanceID];
+        id pubSub = [FIRMessaging messaging];
         for (NSString *topic in topics) {
             NSLog(@"unsubscribe from topic: %@", topic);
             [pubSub unsubscribeFromTopic:topic];
@@ -129,7 +129,7 @@ - (void)subscribe:(CDVInvokedUrlCommand*)command;
 
     if (topic != nil) {
         NSLog(@"subscribe from topic: %@", topic);
-        id pubSub = [FIRInstanceID instanceID];
+        id pubSub = [FIRMessaging messaging];
         [pubSub subscribeToTopic:[NSString stringWithFormat:@"/topics/%@", topic]];
         NSLog(@"Successfully subscribe to topic %@", topic);
         [self successWithMessage:command.callbackId withMsg:[NSString stringWithFormat:@"Successfully subscribe to topic %@", topic]];
@@ -145,7 +145,7 @@ - (void)unsubscribe:(CDVInvokedUrlCommand*)command;
 
     if (topic != nil) {
         NSLog(@"unsubscribe from topic: %@", topic);
-        id pubSub = [FIRInstanceID instanceID];
+        id pubSub = [FIRMessaging messaging];
         [pubSub unsubscribeFromTopic:[NSString stringWithFormat:@"/topics/%@", topic]];
         NSLog(@"Successfully unsubscribe to topic %@", topic);
         [self successWithMessage:command.callbackId withMsg:[NSString stringWithFormat:@"Successfully unsubscribe from topic %@", topic]];