Skip to content

Commit 3875cc6

Browse files
fix(messaging, ios): fixed isHeadless for react-native-navigation (#7868)
Co-authored-by: Russell Wheatley <[email protected]>
1 parent bcaa464 commit 3875cc6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

packages/messaging/ios/RNFBMessaging/RNFBMessaging+NSNotificationCenter.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ - (void)application_onDidFinishLaunchingNotification:(nonnull NSNotification *)n
9696

9797
if (notification.userInfo[UIApplicationLaunchOptionsRemoteNotificationKey]) {
9898
if ([UIApplication sharedApplication].applicationState == UIApplicationStateBackground) {
99+
isHeadless = YES;
99100
if (rctRootView != nil) {
100-
isHeadless = YES;
101101
NSMutableDictionary *appPropertiesDict = rctRootView.appProperties != nil
102102
? [rctRootView.appProperties mutableCopy]
103103
: [NSMutableDictionary dictionary];
@@ -120,8 +120,8 @@ - (void)application_onDidFinishLaunchingNotification:(nonnull NSNotification *)n
120120
[[UIApplication sharedApplication] registerForRemoteNotifications];
121121
// #endif
122122
} else {
123+
isHeadless = NO;
123124
if (rctRootView != nil) {
124-
isHeadless = NO;
125125
NSMutableDictionary *appPropertiesDict = rctRootView.appProperties != nil
126126
? [rctRootView.appProperties mutableCopy]
127127
: [NSMutableDictionary dictionary];
@@ -133,8 +133,8 @@ - (void)application_onDidFinishLaunchingNotification:(nonnull NSNotification *)n
133133
}
134134
}
135135
} else {
136+
isHeadless = NO;
136137
if (rctRootView != nil) {
137-
isHeadless = NO;
138138
NSMutableDictionary *appPropertiesDict = rctRootView.appProperties != nil
139139
? [rctRootView.appProperties mutableCopy]
140140
: [NSMutableDictionary dictionary];
@@ -148,6 +148,7 @@ - (void)application_onDidFinishLaunchingNotification:(nonnull NSNotification *)n
148148
}
149149

150150
- (void)application_onDidEnterForeground {
151+
isHeadless = NO;
151152
if ([UIApplication sharedApplication].delegate != nil &&
152153
[UIApplication sharedApplication].delegate.window != nil &&
153154
[UIApplication sharedApplication].delegate.window.rootViewController != nil &&
@@ -160,7 +161,6 @@ - (void)application_onDidEnterForeground {
160161
if (rctRootView.appProperties != nil &&
161162
[rctRootView.appProperties[@"isHeadless"] isEqual:@(YES)]) {
162163
NSMutableDictionary *appPropertiesDict = [rctRootView.appProperties mutableCopy];
163-
isHeadless = NO;
164164
if ([appPropertiesDict objectForKey:@"isHeadless"] != nil &&
165165
[appPropertiesDict[@"isHeadless"] isEqual:@([RCTConvert BOOL:@(YES)])]) {
166166
appPropertiesDict[@"isHeadless"] = @([RCTConvert BOOL:@(isHeadless)]);

0 commit comments

Comments
 (0)