Fixing notification received when App is Inactive

emawby · emawby · commit 717fa414ecf0 · 2020-08-05T16:35:13.000-07:00
diff --git a/iOS_SDK/OneSignalSDK/Source/OneSignal.m b/iOS_SDK/OneSignalSDK/Source/OneSignal.m
@@ -2243,15 +2243,14 @@ + (BOOL)remoteSilentNotification:(UIApplication*)application UserInfo:(NSDiction
         }
     }
     // Method was called due to a tap on a notification - Fire open notification
-    else if (application.applicationState != UIApplicationStateBackground) {
+    else if (application.applicationState == UIApplicationStateActive) {
         [OneSignalHelper lastMessageReceived:userInfo];
         
-        if (application.applicationState == UIApplicationStateActive)
-            [OneSignalHelper handleNotificationReceived:OSNotificationDisplayTypeNotification fromBackground:NO];
-
-        if (![OneSignalHelper isRemoteSilentNotification:userInfo])
-            [OneSignal notificationReceived:userInfo foreground:application.applicationState == UIApplicationStateActive isActive:NO wasOpened:YES];
+        [OneSignalHelper handleNotificationReceived:OSNotificationDisplayTypeNotification fromBackground:NO];
         
+        if (![OneSignalHelper isRemoteSilentNotification:userInfo]) {
+             [OneSignal notificationReceived:userInfo foreground:YES isActive:NO wasOpened:YES];
+        }
         return startedBackgroundJob;
     }
     // content-available notification received in the background - Fire handleNotificationReceived block in app

Original file line number	Diff line number	Diff line change
`@@ -2243,15 +2243,14 @@ + (BOOL)remoteSilentNotification:(UIApplication*)application UserInfo:(NSDiction`
`2243`	`2243`	`}`
`2244`	`2244`	`}`
`2245`	`2245`	`// Method was called due to a tap on a notification - Fire open notification`
`2246`		`- else if (application.applicationState != UIApplicationStateBackground) {`
	`2246`	`+ else if (application.applicationState == UIApplicationStateActive) {`
`2247`	`2247`	`[OneSignalHelper lastMessageReceived:userInfo];`
`2248`	`2248`
`2249`		`- if (application.applicationState == UIApplicationStateActive)`
`2250`		`- [OneSignalHelper handleNotificationReceived:OSNotificationDisplayTypeNotification fromBackground:NO];`
`2251`		`-`
`2252`		`- if (![OneSignalHelper isRemoteSilentNotification:userInfo])`
`2253`		`- [OneSignal notificationReceived:userInfo foreground:application.applicationState == UIApplicationStateActive isActive:NO wasOpened:YES];`
	`2249`	`+ [OneSignalHelper handleNotificationReceived:OSNotificationDisplayTypeNotification fromBackground:NO];`
`2254`	`2250`
	`2251`	`+ if (![OneSignalHelper isRemoteSilentNotification:userInfo]) {`
	`2252`	`+ [OneSignal notificationReceived:userInfo foreground:YES isActive:NO wasOpened:YES];`
	`2253`	`+ }`
`2255`	`2254`	`return startedBackgroundJob;`
`2256`	`2255`	`}`
`2257`	`2256`	`// content-available notification received in the background - Fire handleNotificationReceived block in app`