Skip to content

Commit 94bb5ee

Browse files
committed
Revert "Runtime approach"
This reverts commit 7db9bdd.
1 parent cde104d commit 94bb5ee

File tree

2 files changed

+14
-20
lines changed

2 files changed

+14
-20
lines changed

FirebaseCore/Extension/FIRHeartbeatLogger.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ typedef NS_ENUM(NSInteger, FIRDailyHeartbeatCode) {
4040

4141
#ifndef FIREBASE_BUILD_CMAKE
4242
/// Returns the header value for the heartbeat logger via the given completion handler..
43-
- (void)asyncHeaderValueWithCompletionHandler:(void (^)(NSString *_Nullable))completionHandler;
43+
- (void)asyncHeaderValueWithCompletionHandler:(void (^)(NSString *_Nullable))completionHandler
44+
API_AVAILABLE(ios(13.0), macosx(10.15), macCatalyst(13.0), tvos(13.0), watchos(6.0));
4445

4546
/// Return the header value for the heartbeat logger.
4647
- (NSString *_Nullable)headerValue;
@@ -86,7 +87,8 @@ NSString *_Nullable FIRHeaderValueFromHeartbeatsPayload(FIRHeartbeatsPayload *he
8687
/// @note This API is thread-safe.
8788
/// @param completionHandler A completion handler to process the flushed payload of heartbeats.
8889
- (void)flushHeartbeatsIntoPayloadWithCompletionHandler:
89-
(void (^)(FIRHeartbeatsPayload *))completionHandler;
90+
(void (^)(FIRHeartbeatsPayload *))completionHandler
91+
API_AVAILABLE(ios(13.0), macosx(10.15), macCatalyst(13.0), tvos(13.0), watchos(6.0));
9092
#endif // FIREBASE_BUILD_CMAKE
9193

9294
/// Gets today's corresponding heartbeat code.

FirebaseCore/Sources/FIRHeartbeatLogger.m

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,11 @@ - (NSString *_Nullable)headerValue {
7474
return FIRHeaderValueFromHeartbeatsPayload([self flushHeartbeatsIntoPayload]);
7575
}
7676

77-
- (void)asyncHeaderValueWithCompletionHandler:(void (^)(NSString *_Nullable))completionHandler {
78-
if (@available(iOS 13.0, macOS 10.15, macCatalyst 13.0, tvOS 13.0, watchOS 6.0, *)) {
79-
[self flushHeartbeatsIntoPayloadWithCompletionHandler:^(FIRHeartbeatsPayload *payload) {
80-
completionHandler(FIRHeaderValueFromHeartbeatsPayload(payload));
81-
}];
82-
} else {
83-
// no-op
84-
completionHandler(nil);
85-
}
77+
- (void)asyncHeaderValueWithCompletionHandler:(void (^)(NSString *_Nullable))completionHandler
78+
API_AVAILABLE(ios(13.0), macosx(10.15), macCatalyst(13.0), tvos(13.0), watchos(6.0)) {
79+
[self flushHeartbeatsIntoPayloadWithCompletionHandler:^(FIRHeartbeatsPayload *payload) {
80+
completionHandler(FIRHeaderValueFromHeartbeatsPayload(payload));
81+
}];
8682
}
8783

8884
- (FIRHeartbeatsPayload *)flushHeartbeatsIntoPayload {
@@ -91,15 +87,11 @@ - (FIRHeartbeatsPayload *)flushHeartbeatsIntoPayload {
9187
}
9288

9389
- (void)flushHeartbeatsIntoPayloadWithCompletionHandler:
94-
(void (^)(FIRHeartbeatsPayload *))completionHandler {
95-
if (@available(iOS 13.0, macOS 10.15, macCatalyst 13.0, tvOS 13.0, watchOS 6.0, *)) {
96-
[_heartbeatController flushAsyncWithCompletionHandler:^(FIRHeartbeatsPayload *payload) {
97-
completionHandler(payload);
98-
}];
99-
} else {
100-
// no-op
101-
completionHandler(nil);
102-
}
90+
(void (^)(FIRHeartbeatsPayload *))completionHandler
91+
API_AVAILABLE(ios(13.0), macosx(10.15), macCatalyst(13.0), tvos(13.0), watchos(6.0)) {
92+
[_heartbeatController flushAsyncWithCompletionHandler:^(FIRHeartbeatsPayload *payload) {
93+
completionHandler(payload);
94+
}];
10395
}
10496
#endif // FIREBASE_BUILD_CMAKE
10597

0 commit comments

Comments
 (0)