Clear badges when entering foreground NOT when didBecomeActive

The application active state is different than the application foreground state. The app resigns and becomes active if the app is interrupted by the notification center even though it remains in the foreground. We previously were dismissing notifications in didBecomeActive so when the notification center was opened while the app was foregrounded we would dismiss notifications.

There also seems to be an apple bug where the resign and become active triggers would fire twice as you are swiping down the notification center. This means that we were dismissing the notifications as you open the notification center which made the problem even worse.

Author: emawby

iOS_SDK/OneSignalSDK/Source/OneSignalLifecycleObserver.m

@@ -68,6 +68,7 @@ + (void)registerLifecycleObserverAsUIScene {
 + (void)registerLifecycleObserverAsUIApplication {
     [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"registering for Application Lifecycle notifications"];
     [[NSNotificationCenter defaultCenter] addObserver:[OneSignalLifecycleObserver sharedInstance] selector:@selector(didEnterBackground) name:UIApplicationDidEnterBackgroundNotification object:nil];
+    [[NSNotificationCenter defaultCenter] addObserver:[OneSignalLifecycleObserver sharedInstance] selector:@selector(willEnterForeground) name:UIApplicationWillEnterForegroundNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:[OneSignalLifecycleObserver sharedInstance] selector:@selector(didBecomeActive) name:UIApplicationDidBecomeActiveNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:[OneSignalLifecycleObserver sharedInstance] selector:@selector(willResignActive) name:UIApplicationWillResignActiveNotification object:nil];
 }
@@ -112,6 +113,11 @@ - (void)didEnterBackground {
     }
 }
 
+- (void)willEnterForeground {
+    [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"application/scene willEnterForeground"];
+    [OneSignalTracker applicationWillEnterForeground];
+}
+
 - (void)dealloc {
     [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"lifecycle observer deallocated"];
     [[NSNotificationCenter defaultCenter] removeObserver:self];

iOS_SDK/OneSignalSDK/Source/OneSignalTracker.h

@@ -31,5 +31,6 @@
 
 + (void)onFocus:(BOOL)toBackground;
 + (void)onSessionEnded:(NSArray<OSInfluence *> *) lastInfluences;
++ (void)applicationWillEnterForeground;
 
 @end

iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m

@@ -77,12 +77,20 @@ + (void)onFocus:(BOOL)toBackground {
     if (toBackground) {
         [self applicationBackgrounded];
     } else {
-        [self applicationForegrounded];
+        [self applicationBecameActive];
     }
 }
 
-+ (void)applicationForegrounded {
+// This is a separate lifecycle event than application became active
+// Notably this is NOT called when the app resumes after resigning active
+// From things like entering and exiting the notification center
++ (void)applicationWillEnterForeground {
     [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:@"Application Foregrounded started"];
+    [OSNotificationsManager clearBadgeCount:false fromClearAll:false];
+}
+
++ (void)applicationBecameActive {
+    [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:@"Application Active started"];
     [OSFocusTimeProcessorFactory cancelFocusCall];
 
     if (OSSessionManager.sharedSessionManager.appEntryState != NOTIFICATION_CLICK)
@@ -100,8 +108,6 @@ + (void)applicationForegrounded {
         // TODO: Here it used to call receivedInAppMessageJson with nil, this method no longer exists
         // [OneSignal receivedInAppMessageJson:nil];
     }
-    
-    [OSNotificationsManager clearBadgeCount:false fromClearAll:false];
 }
 
 + (void)applicationBackgrounded {