Skip to content

Commit 1f6c2ff

Browse files
Messaging token refresh delegate should be able to return null token (#6647)
1 parent 8eded3f commit 1f6c2ff

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

FirebaseMessaging/Apps/Sample/Sample/SceneDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate, MessagingDelegate {
7272
.store(in: &cancellables)
7373
}
7474

75-
func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String) {
75+
func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String?) {
7676
identity.token = fcmToken
7777
}
7878
}

FirebaseMessaging/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# unreleased -- v.7.0.0
22
- [changed] Remove the deprecated FCM direct channel API and Upstream send API. (#6430)
3+
- [changed] The `messaging:didReceiveRegistrationToken:` should be able to return a null token. Update the API parameter fcmToken to be nullable. (#5339)
34
- [fixed] Fixed an issue that downloading an image failed when there's no extension in the file name but MIME type is set. (#6590)
45

56
# 2020-09 -- v.4.7.1

FirebaseMessaging/Sources/Public/FirebaseMessaging/FIRMessaging.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ NS_SWIFT_NAME(MessagingDelegate)
146146
///
147147
/// * Subscribing to any topics.
148148
- (void)messaging:(FIRMessaging *)messaging
149-
didReceiveRegistrationToken:(NSString *)fcmToken
149+
didReceiveRegistrationToken:(nullable NSString *)fcmToken
150150
NS_SWIFT_NAME(messaging(_:didReceiveRegistrationToken:));
151151
@end
152152

FirebaseMessaging/Tests/IntegrationTests/FIRMessagingTokenRefreshTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
var messaging = Messaging.messaging()
2929
var delegateIsCalled = false
3030

31-
func messaging(_: Messaging, didReceiveRegistrationToken _: String) {
31+
func messaging(_: Messaging, didReceiveRegistrationToken _: String?) {
3232
delegateIsCalled = true
3333
}
3434
}

0 commit comments

Comments
 (0)