From 0577518578e688221149b82ec2a12062d19fd625 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 16 Nov 2017 15:45:29 +0800 Subject: [PATCH 1/2] fix for 'show_in_foreground' flag of local notification for iOS 10+ --- ios/RNFirebase/messaging/RNFirebaseMessaging.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ios/RNFirebase/messaging/RNFirebaseMessaging.m b/ios/RNFirebase/messaging/RNFirebaseMessaging.m index 36294b79..dfca2348 100644 --- a/ios/RNFirebase/messaging/RNFirebaseMessaging.m +++ b/ios/RNFirebase/messaging/RNFirebaseMessaging.m @@ -45,6 +45,10 @@ RCT_ENUM_CONVERTER(NSCalendarUnit, content.userInfo = details; content.badge = [RCTConvert NSNumber:details[@"badge"]]; + if(details[@"show_in_foreground"]) { + [content setValue:@YES forKeyPath:@"shouldAlwaysAlertWhileAppIsForeground"]; + } + NSDate *fireDate = [RCTConvert NSDate:details[@"fire_date"]]; if(fireDate == nil){ From 02ac39678ea198280f155125be3d4015700b8107 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 16 Nov 2017 16:58:10 +0800 Subject: [PATCH 2/2] flag checking fix --- ios/RNFirebase/messaging/RNFirebaseMessaging.m | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ios/RNFirebase/messaging/RNFirebaseMessaging.m b/ios/RNFirebase/messaging/RNFirebaseMessaging.m index dfca2348..226b30a9 100644 --- a/ios/RNFirebase/messaging/RNFirebaseMessaging.m +++ b/ios/RNFirebase/messaging/RNFirebaseMessaging.m @@ -45,8 +45,10 @@ RCT_ENUM_CONVERTER(NSCalendarUnit, content.userInfo = details; content.badge = [RCTConvert NSNumber:details[@"badge"]]; - if(details[@"show_in_foreground"]) { - [content setValue:@YES forKeyPath:@"shouldAlwaysAlertWhileAppIsForeground"]; + if([details objectForKey:@"show_in_foreground"] != nil) { + if([(NSNumber *)details[@"show_in_foreground"] boolValue] == YES) { + [content setValue:@YES forKeyPath:@"shouldAlwaysAlertWhileAppIsForeground"]; + } } NSDate *fireDate = [RCTConvert NSDate:details[@"fire_date"]];