From 465e9a1f0ea9dc552a5bf4afbb164a433c6b5e62 Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Wed, 4 Apr 2018 10:56:23 -0400 Subject: Update component versions for 4.12.0 (#1024) --- Firebase/Core/FIROptions.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Firebase') diff --git a/Firebase/Core/FIROptions.m b/Firebase/Core/FIROptions.m index b53fa52..52c254e 100644 --- a/Firebase/Core/FIROptions.m +++ b/Firebase/Core/FIROptions.m @@ -43,7 +43,7 @@ NSString *const kFIRIsSignInEnabled = @"IS_SIGNIN_ENABLED"; NSString *const kFIRLibraryVersionID = @"4" // Major version (one or more digits) @"00" // Minor version (exactly 2 digits) - @"18" // Build number (exactly 2 digits) + @"19" // Build number (exactly 2 digits) @"000"; // Fixed "000" // Plist file name. NSString *const kServiceInfoFileName = @"GoogleService-Info"; -- cgit v1.2.3 From 4416b60446029d7be5443a48b4532598758bdf58 Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Wed, 4 Apr 2018 18:34:28 -0400 Subject: Cherry Pick of comments and changelog for M23 (#1028) * updates the changelog for pending release (#1025) * updates the changelog for pending release * addresses comment * Fix the comments for subscribe to topic (#1026) --- Firebase/Auth/CHANGELOG.md | 4 ++++ Firebase/Messaging/Public/FIRMessaging.h | 16 +++++----------- 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'Firebase') diff --git a/Firebase/Auth/CHANGELOG.md b/Firebase/Auth/CHANGELOG.md index 846c2ca..fd5af27 100644 --- a/Firebase/Auth/CHANGELOG.md +++ b/Firebase/Auth/CHANGELOG.md @@ -8,6 +8,10 @@ email-link authentication. If `handleCodeInApp` is set to false an invalid argument exception is thrown (#931). +- Adds support for passing the deep link (which is embedded in the sign-in link sent via email) to the + `signInWithEmail:link:completion:` and `isSignInWithEmailLink:` methods during an + email/link sign-in flow (#1023). + # v4.5.0 - Adds new API which provides a way to determine the sign-in methods associated with an email address. diff --git a/Firebase/Messaging/Public/FIRMessaging.h b/Firebase/Messaging/Public/FIRMessaging.h index f56b7ab..d3fdf59 100644 --- a/Firebase/Messaging/Public/FIRMessaging.h +++ b/Firebase/Messaging/Public/FIRMessaging.h @@ -469,13 +469,10 @@ NS_SWIFT_NAME(Messaging) - (void)subscribeToTopic:(nonnull NSString *)topic NS_SWIFT_NAME(subscribe(toTopic:)); /** - * Asynchronously subscribe to the topic. Adds to the pending list of topic operations. - * Retry in case of failures. This makes a repeated attempt to subscribe to the topic - * as compared to the `subscribe` method above which tries once. + * Asynchronously subscribe to the provided topic, retrying on failure. * - * @param topic The topic name to subscribe to. Should be of the form - * `"/topics/"`. - * @param completion The completion that is invoked once the unsubscribe call ends. + * @param topic The topic name to subscribe to, for example, @"sports". + * @param completion The completion that is invoked once the subscribe call ends. * In case of success, nil error is returned. Otherwise, an * appropriate error object is returned. */ @@ -490,12 +487,9 @@ NS_SWIFT_NAME(Messaging) - (void)unsubscribeFromTopic:(nonnull NSString *)topic NS_SWIFT_NAME(unsubscribe(fromTopic:)); /** - * Asynchronously unsubscribe from the topic. Adds to the pending list of topic operations. - * Retry in case of failures. This makes a repeated attempt to unsubscribe from the topic - * as compared to the `unsubscribe` method above which tries once. + * Asynchronously unsubscribe from the provided topic, retrying on failure. * - * @param topic The topic name to unsubscribe from. Should be of the form - * `"/topics/"`. + * @param topic The topic name to unsubscribe from, for example @"sports". * @param completion The completion that is invoked once the unsubscribe call ends. * In case of success, nil error is returned. Otherwise, an * appropriate error object is returned. -- cgit v1.2.3 From 5e2a9e43869b7bc16acf4ecc1f6ba813bccbed72 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Wed, 4 Apr 2018 14:35:35 -0700 Subject: Fix build break from trailing whitespace (#1027) --- Firebase/Auth/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Firebase') diff --git a/Firebase/Auth/CHANGELOG.md b/Firebase/Auth/CHANGELOG.md index fd5af27..94d508b 100644 --- a/Firebase/Auth/CHANGELOG.md +++ b/Firebase/Auth/CHANGELOG.md @@ -8,8 +8,8 @@ email-link authentication. If `handleCodeInApp` is set to false an invalid argument exception is thrown (#931). -- Adds support for passing the deep link (which is embedded in the sign-in link sent via email) to the - `signInWithEmail:link:completion:` and `isSignInWithEmailLink:` methods during an +- Adds support for passing the deep link (which is embedded in the sign-in link sent via email) to the + `signInWithEmail:link:completion:` and `isSignInWithEmailLink:` methods during an email/link sign-in flow (#1023). # v4.5.0 -- cgit v1.2.3 From fb14ee35fa0c666b15574cdedb4efdefe8cf9fca Mon Sep 17 00:00:00 2001 From: Ryan Wilson Date: Thu, 5 Apr 2018 10:13:20 -0400 Subject: Fix nullability warning with new Messaging API (#1029) (#1032) --- Firebase/Messaging/Public/FIRMessaging.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Firebase') diff --git a/Firebase/Messaging/Public/FIRMessaging.h b/Firebase/Messaging/Public/FIRMessaging.h index d3fdf59..479f68e 100644 --- a/Firebase/Messaging/Public/FIRMessaging.h +++ b/Firebase/Messaging/Public/FIRMessaging.h @@ -476,7 +476,7 @@ NS_SWIFT_NAME(Messaging) * In case of success, nil error is returned. Otherwise, an * appropriate error object is returned. */ -- (void)subscribeToTopic:(NSString *)topic +- (void)subscribeToTopic:(nonnull NSString *)topic completion:(nullable FIRMessagingTopicOperationCompletion)completion; /** @@ -494,7 +494,7 @@ NS_SWIFT_NAME(Messaging) * In case of success, nil error is returned. Otherwise, an * appropriate error object is returned. */ -- (void)unsubscribeFromTopic:(NSString *)topic +- (void)unsubscribeFromTopic:(nonnull NSString *)topic completion:(nullable FIRMessagingTopicOperationCompletion)completion; #pragma mark - Upstream -- cgit v1.2.3