move badge clearing and notif type updates to notifications module

Move uiscene check to core in a bundle utils file
Create stub unit testing file for notifications

Author: emawby

iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj

@@ -0,0 +1,11 @@
+//
+//  OSBundleUtils.h
+//  OneSignal
+//
+//  Created by Elliot Mawby on 6/20/24.
+//  Copyright © 2024 Hiptic. All rights reserved.
+//
+
+@interface OSBundleUtils : NSObject
++ (BOOL)isAppUsingUIScene;
+@end

iOS_SDK/OneSignalSDK/OneSignalCore/Source/OSBundleUtils.h

@@ -0,0 +1,20 @@
+//
+//  OSBundleUtils.m
+//  OneSignalCore
+//
+//  Created by Elliot Mawby on 6/17/24.
+//  Copyright © 2024 Hiptic. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "OSBundleUtils.h"
+@implementation OSBundleUtils
+
++ (BOOL)isAppUsingUIScene {
+    if (@available(iOS 13.0, *)) {
+        return [[NSBundle mainBundle] objectForInfoDictionaryKey:@"UIApplicationSceneManifest"] != nil;
+    }
+    return NO;
+}
+
+@end

iOS_SDK/OneSignalSDK/OneSignalCore/Source/OSBundleUtils.m

@@ -56,7 +56,7 @@
 #import <OneSignalCore/OneSignalWrapper.h>
 #import <OneSignalCore/OSInAppMessages.h>
 #import <OneSignalCore/OSLocation.h>
-
+#import <OneSignalCore/OSBundleUtils.h>
 // TODO: Testing: Should this class be defined in this file?
 @interface OneSignalCoreImpl : NSObject
 

iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCore.h

@@ -251,9 +251,38 @@ + (void)start {
         @selector(onesignalSetApplicationIconBadgeNumber:)
     );
     [OneSignalNotificationsUNUserNotificationCenter setup];
+    
+    [self registerLifecycleObserver];
+    
 }
 #pragma clang diagnostic pop
 
++ (void)registerLifecycleObserver {
+    // Replacing swizzled lifecycle selectors with notification center observers for scene based Apps
+    if ([OSBundleUtils isAppUsingUIScene]) {
+        [self registerLifecycleObserverAsUIScene];
+    } else {
+        [self registerLifecycleObserverAsUIApplication];
+    }
+}
+
++ (void)registerLifecycleObserverAsUIScene {
+    if (@available(iOS 13.0, *)) {
+        [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"OSNotificationManager registering for Scene Lifecycle notifications"];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willEnterForeground) name:@"UISceneWillEnterForegroundNotification" object:nil];
+    }
+}
+
++ (void)registerLifecycleObserverAsUIApplication {
+    [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"OSNotificationManager registering for Application Lifecycle notifications"];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willEnterForeground) name:UIApplicationWillEnterForegroundNotification object:nil];
+}
+
++ (void)willEnterForeground {
+    [OSNotificationsManager clearBadgeCount:false fromClearAll:false];
+    [OSNotificationsManager sendNotificationTypesUpdateToDelegate];
+}
+
 + (void)resetLocals {
     _lastMessageReceived = nil;
     _lastMessageIdFromAction = nil;
@@ -967,6 +996,10 @@ + (UNNotificationRequest*)prepareUNNotificationRequest:(OSNotification*)notifica
     return [UNNotificationRequest requestWithIdentifier:identifier content:content trigger:trigger];
 }
 
+- (void)dealloc {
+    [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"OSNotificationsManager observer deallocated"];
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
 
 @end
 

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m

@@ -0,0 +1,72 @@
+//
+//  OneSignalNotificationsTests.swift
+//  OneSignalNotificationsTests
+//
+//  Created by Elliot Mawby on 6/17/24.
+//  Copyright © 2024 Hiptic. All rights reserved.
+//
+
+import XCTest
+
+final class OneSignalNotificationsTests: XCTestCase {
+
+    override func setUpWithError() throws {
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+
+    override func tearDownWithError() throws {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+    }
+
+    func testExample() throws {
+        // This is an example of a functional test case.
+        // Use XCTAssert and related functions to verify your tests produce the correct results.
+        // Any test you write for XCTest can be annotated as throws and async.
+        // Mark your test throws to produce an unexpected failure when your test encounters an uncaught error.
+        // Mark your test async to allow awaiting for asynchronous code to complete. Check the results with assertions afterwards.
+    }
+
+    func testPerformanceExample() throws {
+        // This is an example of a performance test case.
+        measure {
+            // Put the code you want to measure the time of here.
+        }
+    }
+    
+    func testClearBadgesWhenAppEntersForeground() throws {
+        // NotificationManager Start? Or Mock NotificationManager start
+        // Mock receive a notification or have badge count > 0
+        
+        // Then background the app
+        
+        // Foreground the app
+        
+        // Ensure that badge count == 0
+    }
+    
+    func testDontclearBadgesWhenAppBecomesActive() throws {
+        // NotificationManager Start? Or Mock NotificationManager start
+        // Mock receive a notification or have badge count > 0
+        
+        // Then resign active
+        
+        // App becomes active the app
+        
+        // Ensure that badge count == previous badge count
+    }
+    
+    func testUpdateNotificationTypesOnAppEntersForeground() throws {
+        // NotificationManager Start? Or Mock NotificationManager start
+        // Deny notification permission
+        
+        // Then background the app
+        
+        // Change app notification permissions
+        
+        // Foreground the app for within 30 seconds
+        
+        // Ensure that we update the notification types
+    }
+    
+
+}

iOS_SDK/OneSignalSDK/OneSignalNotificationsTests/OneSignalNotificationsTests.swift

@@ -49,7 +49,7 @@ +(OneSignalLifecycleObserver*) sharedInstance {
 
 + (void)registerLifecycleObserver {
     // Replacing swizzled lifecycle selectors with notification center observers for scene based Apps
-    if ([UIApplication isAppUsingUIScene]) {
+    if ([OSBundleUtils isAppUsingUIScene]) {
         [self registerLifecycleObserverAsUIScene];
     } else {
         [self registerLifecycleObserverAsUIApplication];
@@ -68,7 +68,6 @@ + (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];
 }
@@ -113,11 +112,6 @@ - (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/OneSignalLifecycleObserver.m

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

iOS_SDK/OneSignalSDK/Source/OneSignalTracker.h

@@ -81,14 +81,6 @@ + (void)onFocus:(BOOL)toBackground {
     }
 }
 
-// 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];
@@ -102,8 +94,6 @@ + (void)applicationBecameActive {
     if ([OneSignal shouldStartNewSession])
         [OneSignal startNewSession:NO];
     else {
-        // This checks if notification permissions changed when app was backgrounded
-        [OSNotificationsManager sendNotificationTypesUpdateToDelegate];
         [[OSSessionManager sharedSessionManager] attemptSessionUpgrade];
         // TODO: Here it used to call receivedInAppMessageJson with nil, this method no longer exists
         // [OneSignal receivedInAppMessageJson:nil];

iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m

@@ -28,5 +28,4 @@
 #import <UIKit/UIKit.h>
 @interface UIApplication (OneSignal)
 + (BOOL)applicationIsActive;
-+ (BOOL)isAppUsingUIScene;
 @end