Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions FirebaseMessaging/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# unreleased
- [fixed] Fixed an issue that topic doesn't work in watchOS. (#6160)
- [fixed] Improved Xcode completion of public API completion handlers in Swift. (#6278)

# 2020-07 -- v4.6.1
- [changed] Remove logic that is executed for iOS 7 and below. (#5835)
Expand Down
9 changes: 5 additions & 4 deletions FirebaseMessaging/Sources/Public/FIRMessaging.h
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,8 @@ NS_SWIFT_NAME(Messaging)
* @param completion The completion handler to handle the token request.
*/
- (void)retrieveFCMTokenForSenderID:(NSString *)senderID
completion:(FIRMessagingFCMTokenFetchCompletion)completion
completion:(void (^)(NSString *_Nullable FCMToken,
NSError *_Nullable error))completion
NS_SWIFT_NAME(retrieveFCMToken(forSenderID:completion:));

/**
Expand All @@ -407,7 +408,7 @@ NS_SWIFT_NAME(Messaging)
* @param completion The completion handler to handle the token deletion.
*/
- (void)deleteFCMTokenForSenderID:(NSString *)senderID
completion:(FIRMessagingDeleteFCMTokenCompletion)completion
completion:(void (^)(NSError *_Nullable error))completion
NS_SWIFT_NAME(deleteFCMToken(forSenderID:completion:));

#pragma mark - Topics
Expand All @@ -432,7 +433,7 @@ NS_SWIFT_NAME(Messaging)
* appropriate error object is returned.
*/
- (void)subscribeToTopic:(nonnull NSString *)topic
completion:(nullable FIRMessagingTopicOperationCompletion)completion;
completion:(void (^_Nullable)(NSError *_Nullable error))completion;

/**
* Asynchronously unsubscribe from a topic. This uses a FCM Token
Expand All @@ -454,7 +455,7 @@ NS_SWIFT_NAME(Messaging)
* appropriate error object is returned.
*/
- (void)unsubscribeFromTopic:(nonnull NSString *)topic
completion:(nullable FIRMessagingTopicOperationCompletion)completion;
completion:(void (^_Nullable)(NSError *_Nullable error))completion;

#pragma mark - Upstream

Expand Down