Skip to content

fix why local timezone message is never logged #3638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 22, 2019
Merged

fix why local timezone message is never logged #3638

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1395c80
fix why local timezone message is never logged
charlotteliang Aug 20, 2019
4316460
apns payload should not be passed down when local notification is sch…
charlotteliang Aug 20, 2019
09ef2a6
fix typo
charlotteliang Aug 20, 2019
f75689f
fix indents
charlotteliang Aug 20, 2019
76695c6
update the constant name better
charlotteliang Aug 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Firebase/Messaging/FIRMessagingContextManagerService.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@
NSString *const kFIRMessagingContextManagerSoundKey = kFIRMessagingContextManagerNotificationKeyPrefix @"sound";
NSString *const kFIRMessagingContextManagerContentAvailableKey =
kFIRMessagingContextManagerNotificationKeyPrefix @"content-available";
NSString *const kFIRMessagingAPNSPayload = @"aps";


typedef NS_ENUM(NSUInteger, FIRMessagingContextManagerMessageType) {
FIRMessagingContextManagerMessageTypeNone,
Expand Down Expand Up @@ -187,6 +189,11 @@ + (NSDictionary *)parseDataFromMessage:(NSDictionary *)message {
continue;
} else if ([keyString hasPrefix:kContextManagerPrefixKey]) {
continue;
} else if ([keyString isEqualToString:kFIRMessagingAPNSPayload]) {
// Local timezone message is scheduled with FCM payload. APNS payload with
// content_available should be ignored and not passed to the scheduled
// messages.
continue;
}
}
data[[key copy]] = message[key];
Expand Down