diff options
author | Chen Liang <chliang@google.com> | 2018-01-24 12:26:08 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-24 12:26:08 -0800 |
commit | fa81c488551575d65fd681e08ff417f354f54e75 (patch) | |
tree | 3544f4504c196bf1244a527596a65f66a9f43d30 /Firebase/Messaging/FIRMessaging.m | |
parent | 4125066bb468f130fe5165cb9188c1ab53c99384 (diff) | |
parent | 8f0c3254632db38ad1dd040b395aaf8f55042fd9 (diff) |
Merge branch 'master' into messaging-copy
Diffstat (limited to 'Firebase/Messaging/FIRMessaging.m')
-rw-r--r-- | Firebase/Messaging/FIRMessaging.m | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Firebase/Messaging/FIRMessaging.m b/Firebase/Messaging/FIRMessaging.m index 5e46a80..11cacb3 100644 --- a/Firebase/Messaging/FIRMessaging.m +++ b/Firebase/Messaging/FIRMessaging.m @@ -36,7 +36,9 @@ #import "FIRMessagingSyncMessageManager.h" #import "FIRMessagingUtilities.h" #import "FIRMessagingVersionUtilities.h" -#import "FIRReachabilityChecker.h" + +#import <FirebaseCore/FIRReachabilityChecker.h> + #import "NSError+FIRMessaging.h" static NSString *const kFIRMessagingMessageViaAPNSRootKey = @"aps"; @@ -412,7 +414,10 @@ static NSString *const kFIRMessagingPlistAutoInitEnabled = }]; } else if ([appDelegate respondsToSelector:openURLWithOptionsSelector]) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunguarded-availability" [appDelegate application:application openURL:url options:@{}]; +#pragma clang diagnostic pop // Similarly, |application:openURL:sourceApplication:annotation:| will also always be called, due // to the default swizzling done by FIRAAppDelegateProxy in Firebase Analytics @@ -763,7 +768,10 @@ static NSString *const kFIRMessagingPlistAutoInitEnabled = - (void)receiver:(FIRMessagingReceiver *)receiver receivedRemoteMessage:(FIRMessagingRemoteMessage *)remoteMessage { if ([self.delegate respondsToSelector:@selector(messaging:didReceiveMessage:)]) { +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunguarded-availability" [self.delegate messaging:self didReceiveMessage:remoteMessage]; +#pragma pop } else if ([self.delegate respondsToSelector:@selector(applicationReceivedRemoteMessage:)]) { #pragma clang diagnostic push #pragma clang diagnostic ignored "-Wdeprecated-declarations" |