Skip to content

Commit 163eeee

Browse files
authored
Revert changes introduced in #546 to fix build breakage. (#562)
1 parent e16c386 commit 163eeee

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

Firebase/Messaging/FIRMessaging.m

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,7 @@ - (void)handleIncomingLinkIfNeededFromMessage:(NSDictionary *)message {
384384
id<UIApplicationDelegate> appDelegate = application.delegate;
385385
SEL continueUserActivitySelector =
386386
@selector(application:continueUserActivity:restorationHandler:);
387+
SEL openURLWithOptionsSelector = @selector(application:openURL:options:);
387388
SEL openURLWithSourceApplicationSelector =
388389
@selector(application:openURL:sourceApplication:annotation:);
389390
SEL handleOpenURLSelector = @selector(application:handleOpenURL:);
@@ -402,7 +403,7 @@ - (void)handleIncomingLinkIfNeededFromMessage:(NSDictionary *)message {
402403
// Do nothing, as we don't support the app calling this block
403404
}];
404405

405-
} else if (@available(iOS 9.0, *)) {
406+
} else if ([appDelegate respondsToSelector:openURLWithOptionsSelector]) {
406407
[appDelegate application:application openURL:url options:@{}];
407408

408409
// Similarly, |application:openURL:sourceApplication:annotation:| will also always be called, due
@@ -726,7 +727,7 @@ - (void)setAPNSToken:(NSData *)apnsToken error:(NSError *)error {
726727

727728
- (void)receiver:(FIRMessagingReceiver *)receiver
728729
receivedRemoteMessage:(FIRMessagingRemoteMessage *)remoteMessage {
729-
if (@available(iOS 10.0, *)) {
730+
if ([self.delegate respondsToSelector:@selector(messaging:didReceiveMessage:)]) {
730731
[self.delegate messaging:self didReceiveMessage:remoteMessage];
731732
} else if ([self.delegate respondsToSelector:@selector(applicationReceivedRemoteMessage:)]) {
732733
#pragma clang diagnostic push

Firebase/Messaging/FIRMessagingContextManagerService.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ + (void)scheduleLocalNotificationForMessage:(NSDictionary *)message
143143
}
144144
if ([apsDictionary[kFIRMessagingContextManagerTitleKey] length]) {
145145
// |alertTitle| is iOS 8.2+, so check if we can set it
146-
if (@available(iOS 8.2, *)) {
146+
if ([notification respondsToSelector:@selector(setAlertTitle:)]) {
147147
notification.alertTitle = apsDictionary[kFIRMessagingContextManagerTitleKey];
148148
}
149149
}

Firebase/Messaging/FIRMessagingRmq2PersistentStore.m

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,9 @@
104104

105105
// Utility to create an NSString from a sqlite3 result code
106106
NSString * _Nonnull FIRMessagingStringFromSQLiteResult(int result) {
107-
const char *errorStr;
108-
if (@available(iOS 8.2, *)) {
109-
errorStr = sqlite3_errstr(result);
110-
} else {
111-
errorStr = "pre iOS 8.2";
112-
}
113-
return [NSString stringWithFormat:@"%d%s", result, errorStr];
107+
const char *errorStr = sqlite3_errstr(result);
108+
NSString *errorString = [NSString stringWithFormat:@"%d - %s", result, errorStr];
109+
return errorString;
114110
}
115111

116112
@interface FIRMessagingRmq2PersistentStore () {

0 commit comments

Comments
 (0)