diff options
Diffstat (limited to 'Firebase/Messaging')
| -rw-r--r-- | Firebase/Messaging/FIRMessaging.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Firebase/Messaging/FIRMessaging.m b/Firebase/Messaging/FIRMessaging.m index d0edadf..3132831 100644 --- a/Firebase/Messaging/FIRMessaging.m +++ b/Firebase/Messaging/FIRMessaging.m @@ -484,7 +484,7 @@ static NSString *const kFIRMessagingPlistAutoInitEnabled = [_messagingUserDefaults setBool:autoInitEnabled forKey:kFIRMessagingUserDefaultsKeyAutoInitEnabled]; if (!isFCMAutoInitEnabled && autoInitEnabled) { - self.defaultFcmToken = [self FCMToken]; + self.defaultFcmToken = [self.instanceIDProxy token]; } } @@ -834,7 +834,7 @@ static NSString *const kFIRMessagingPlistAutoInitEnabled = #pragma mark - Notifications - (void)didReceiveDefaultInstanceIDToken:(NSNotification *)notification { - if (![notification.object isKindOfClass:[NSString class]]) { + if (notification.object && ![notification.object isKindOfClass:[NSString class]]) { FIRMessagingLoggerDebug(kFIRMessagingMessageCodeMessaging015, @"Invalid default FCM token type %@", NSStringFromClass([notification.object class])); |