Skip to content

Commit 1098342

Browse files
authored
[Config] Move away from private typedef (#14254)
1 parent f922738 commit 1098342

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

FirebaseRemoteConfig/Sources/Private/RCNConfigFetch.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727

2828
NS_ASSUME_NONNULL_BEGIN
2929

30-
/// Completion handler invoked by NSSessionFetcher.
31-
typedef void (^RCNConfigFetcherCompletion)(NSData *data, NSURLResponse *response, NSError *error);
32-
3330
/// Completion handler invoked after a fetch that contains the updated keys
3431
typedef void (^RCNConfigFetchCompletion)(FIRRemoteConfigFetchStatus status,
3532
FIRRemoteConfigUpdate *update,

FirebaseRemoteConfig/Sources/RCNConfigFetch.m

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,7 @@ - (void)fetchWithUserProperties:(NSDictionary *)userProperties
423423

424424
FIRLogDebug(kFIRLoggerRemoteConfig, @"I-RCN000040", @"Start config fetch.");
425425
__weak RCNConfigFetch *weakSelf = self;
426-
RCNConfigFetcherCompletion fetcherCompletion = ^(NSData *data, NSURLResponse *response,
427-
NSError *error) {
426+
__auto_type fetcherCompletion = ^(NSData *data, NSURLResponse *response, NSError *error) {
428427
FIRLogDebug(kFIRLoggerRemoteConfig, @"I-RCN000050",
429428
@"config fetch completed. Error: %@ StatusCode: %ld", (error ? error : @"nil"),
430429
(long)[((NSHTTPURLResponse *)response) statusCode]);
@@ -651,7 +650,9 @@ - (NSURLSession *)newFetchSession {
651650
- (NSURLSessionDataTask *)URLSessionDataTaskWithContent:(NSData *)content
652651
fetchTypeHeader:(NSString *)fetchTypeHeader
653652
completionHandler:
654-
(RCNConfigFetcherCompletion)fetcherCompletion {
653+
(void (^)(NSData *data,
654+
NSURLResponse *response,
655+
NSError *error))fetcherCompletion {
655656
NSURL *URL = [NSURL URLWithString:[self constructServerURL]];
656657
FIRLogDebug(kFIRLoggerRemoteConfig, @"I-RCN000046", @"%@",
657658
[NSString stringWithFormat:@"Making config request: %@", [URL absoluteString]]);

FirebaseRemoteConfig/Tests/Unit/RCNPersonalizationTest.m

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@
3232
@interface RCNConfigFetch (ForTest)
3333
- (NSURLSessionDataTask *)URLSessionDataTaskWithContent:(NSData *)content
3434
fetchTypeHeader:(NSString *)fetchTypeHeader
35-
completionHandler:
36-
(RCNConfigFetcherCompletion)fetcherCompletion;
35+
completionHandler:(void (^)(NSData *data,
36+
NSURLResponse *response,
37+
NSError *error))fetcherCompletion;
3738

3839
- (void)fetchWithUserProperties:(NSDictionary *)userProperties
3940
fetchTypeHeader:(NSString *)fetchTypeHeader

FirebaseRemoteConfig/Tests/Unit/RCNRemoteConfigTest.m

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ - (void)fetchWithUserPropertiesCompletionHandler:(NSString *)fetchTypeHeader
4949
completionHandler:(FIRAInteropUserPropertiesCallback)block;
5050
- (NSURLSessionDataTask *)URLSessionDataTaskWithContent:(NSData *)content
5151
fetchTypeHeader:(NSString *)fetchTypeHeader
52-
completionHandler:
53-
(RCNConfigFetcherCompletion)fetcherCompletion;
52+
completionHandler:(void (^)(NSData *data,
53+
NSURLResponse *response,
54+
NSError *error))fetcherCompletion;
5455
- (void)fetchConfigWithExpirationDuration:(NSTimeInterval)expirationDuration
5556
completionHandler:(FIRRemoteConfigFetchCompletion)completionHandler;
5657
- (void)realtimeFetchConfigWithNoExpirationDuration:(NSInteger)fetchAttemptNumber

0 commit comments

Comments
 (0)