feat: enhance manual integration support and swizzling control

- Added APIs for manual notification handling and lifecycle observation when swizzling is disabled.
- Introduced a new constant for controlling swizzling via Info.plist.

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCommonDefines.h

@@ -155,6 +155,9 @@
 #define GDPR_CONSENT_GRANTED @"GDPR_CONSENT_GRANTED"
 #define ONESIGNAL_REQUIRE_PRIVACY_CONSENT @"OneSignal_require_privacy_consent"
 
+// Swizzling
+#define ONESIGNAL_DISABLE_SWIZZLING @"OneSignal_disable_swizzling"
+
 // Badge handling
 #define ONESIGNAL_DISABLE_BADGE_CLEARING @"OneSignal_disable_badge_clearing"
 #define ONESIGNAL_APP_GROUP_NAME_KEY @"OneSignal_app_groups_key"

iOS_SDK/OneSignalSDK/OneSignalNotifications/Categories/UNUserNotificationCenter+OneSignalNotifications.m

@@ -377,19 +377,7 @@ + (BOOL)isDismissEvent:(UNNotificationResponse *)response {
 }
 
 + (void)processiOS10Open:(UNNotificationResponse*)response {
-    if (![OneSignalConfigManager getAppId])
-        return;
-    
-    if ([OneSignalNotificationsUNUserNotificationCenter isDismissEvent:response])
-        return;
-    
-    if (![OneSignalCoreHelper isOneSignalPayload:response.notification.request.content.userInfo])
-        return;
-    
-    let userInfo = [OneSignalCoreHelper formatApsPayloadIntoStandard:response.notification.request.content.userInfo
-                                                      identifier:response.actionIdentifier];
-
-    [OSNotificationsManager notificationReceived:userInfo wasOpened:YES];
+    [OSNotificationsManager handleNotificationResponse:response];
 }
 
 // Calls depercated pre-iOS 10 selector if one is set on the AppDelegate.

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.h

@@ -65,6 +65,13 @@ NS_SWIFT_NAME(onClick(event:));
 + (void)addPermissionObserver:(NSObject<OSNotificationPermissionObserver>*_Nonnull)observer NS_REFINED_FOR_SWIFT;
 + (void)removePermissionObserver:(NSObject<OSNotificationPermissionObserver>*_Nonnull)observer NS_REFINED_FOR_SWIFT;
 + (void)clearAll;
+// Manual integration APIs (for use when swizzling is disabled via Info.plist)
++ (void)didRegisterForRemoteNotifications:(UIApplication *_Nonnull)app deviceToken:(NSData *_Nonnull)inDeviceToken;
++ (void)handleDidFailRegisterForRemoteNotification:(NSError *_Nonnull)err;
++ (BOOL)receiveRemoteNotification:(UIApplication *_Nonnull)application UserInfo:(NSDictionary *_Nonnull)userInfo completionHandler:(void (^_Nonnull)(UIBackgroundFetchResult))completionHandler;
++ (void)handleWillPresentNotificationInForegroundWithPayload:(NSDictionary *_Nonnull)payload withCompletion:(OSNotificationDisplayResponse _Nonnull)completion;
++ (void)handleNotificationResponse:(UNNotificationResponse *_Nonnull)response;
++ (void)setBadgeCount:(NSInteger)badgeCount;
 @end
 
 
@@ -116,10 +123,8 @@ NS_SWIFT_NAME(onClick(event:));
 + (void)handleNotificationActionWithUrl:(NSString* _Nullable)url actionID:(NSString* _Nonnull)actionID;
 + (void)clearBadgeCount:(BOOL)fromNotifOpened fromClearAll:(BOOL)fromClearAll;
 
-+ (BOOL)receiveRemoteNotification:(UIApplication* _Nonnull)application UserInfo:(NSDictionary* _Nonnull)userInfo completionHandler:(void (^_Nonnull)(UIBackgroundFetchResult))completionHandler;
 + (void)notificationReceived:(NSDictionary* _Nonnull)messageDict wasOpened:(BOOL)opened;
-+ (void)handleWillPresentNotificationInForegroundWithPayload:(NSDictionary * _Nonnull)payload withCompletion:(OSNotificationDisplayResponse _Nonnull)completion;
-+ (void)didRegisterForRemoteNotifications:(UIApplication *_Nonnull)app deviceToken:(NSData *_Nonnull)inDeviceToken;
-+ (void)handleDidFailRegisterForRemoteNotification:(NSError*_Nonnull)err;
 + (void)checkProvisionalAuthorizationStatus;
++ (void)registerLifecycleObserver;
+
 @end

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m

@@ -252,9 +252,6 @@ + (void)start {
         @selector(onesignalSetApplicationIconBadgeNumber:)
     );
     [OneSignalNotificationsUNUserNotificationCenter setup];
-    
-    [self registerLifecycleObserver];
-    
 }
 #pragma clang diagnostic pop
 
@@ -653,7 +650,8 @@ + (NSString*)checkForProcessedDups:(NSDictionary*)customDict lastMessageId:(NSSt
 
 + (void)handleWillPresentNotificationInForegroundWithPayload:(NSDictionary *)payload withCompletion:(OSNotificationDisplayResponse)completion {
     // check to make sure the app is in focus and it's a OneSignal notification
-    if (![OneSignalCoreHelper isOneSignalPayload:payload]
+    if ([OSPrivacyConsentController shouldLogMissingPrivacyConsentErrorWithMethodName:nil]
+        || ![OneSignalCoreHelper isOneSignalPayload:payload]
         || UIApplication.sharedApplication.applicationState == UIApplicationStateBackground) {
         completion([OSNotification new]);
         return;
@@ -662,10 +660,16 @@ + (void)handleWillPresentNotificationInForegroundWithPayload:(NSDictionary *)pay
 
     OSDisplayableNotification *osNotification = [OSDisplayableNotification parseWithApns:payload];
     if ([osNotification additionalData][ONESIGNAL_IAM_PREVIEW]) {
+        [self notificationReceived:payload wasOpened:NO];
         completion(nil);
         return;
     }
-    [self handleWillShowInForegroundForNotification:osNotification completion:completion];
+
+    OSNotificationDisplayResponse wrappedCompletion = ^(OSNotification *notification) {
+        [self notificationReceived:payload wasOpened:NO];
+        completion(notification);
+    };
+    [self handleWillShowInForegroundForNotification:osNotification completion:wrappedCompletion];
 }
 
 + (void)handleWillShowInForegroundForNotification:(OSDisplayableNotification *)notification completion:(OSNotificationDisplayResponse)completion {
@@ -801,17 +805,7 @@ + (void)clearBadgeCount:(BOOL)fromNotifOpened fromClearAll:(BOOL)fromClearAll {
         return;
     }
 
-    if (@available(iOS 16.0, *)) {
-        [[UNUserNotificationCenter currentNotificationCenter] setBadgeCount:0 withCompletionHandler:^(NSError * _Nullable error) {
-            if (error) {
-                [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"clearBadgeCount encountered error setting badge count: %@", error]];
-            }
-        }];
-    } else {
-        [OneSignalCoreHelper runOnMainThread:^{
-            [[UIApplication sharedApplication] setApplicationIconBadgeNumber:0];
-        }];
-    }
+    [self setBadgeCount:0];
 }
 
 + (BOOL)handleIAMPreview:(OSNotification *)notification {
@@ -1000,6 +994,37 @@ + (UNNotificationRequest*)prepareUNNotificationRequest:(OSNotification*)notifica
     return [UNNotificationRequest requestWithIdentifier:identifier content:content trigger:trigger];
 }
 
+#pragma mark - Manual Integration APIs (for use when swizzling is disabled)
+
++ (void)handleNotificationResponse:(UNNotificationResponse *)response {
+    if ([OSPrivacyConsentController shouldLogMissingPrivacyConsentErrorWithMethodName:nil])
+        return;
+    if (![OneSignalConfigManager getAppId])
+        return;
+    if ([@"com.apple.UNNotificationDismissActionIdentifier" isEqual:response.actionIdentifier])
+        return;
+    if (![OneSignalCoreHelper isOneSignalPayload:response.notification.request.content.userInfo])
+        return;
+    NSDictionary *userInfo = [OneSignalCoreHelper formatApsPayloadIntoStandard:response.notification.request.content.userInfo
+                                                                    identifier:response.actionIdentifier];
+    [self notificationReceived:userInfo wasOpened:YES];
+}
+
++ (void)setBadgeCount:(NSInteger)badgeCount {
+    [OneSignalBadgeHelpers updateCachedBadgeValue:badgeCount usePreviousBadgeCount:false];
+    if (@available(iOS 16.0, *)) {
+        [[UNUserNotificationCenter currentNotificationCenter] setBadgeCount:badgeCount withCompletionHandler:^(NSError * _Nullable error) {
+            if (error) {
+                [OneSignalLog onesignalLog:ONE_S_LL_ERROR message:[NSString stringWithFormat:@"setBadgeCount encountered error setting badge count: %@", error]];
+            }
+        }];
+    } else {
+        [OneSignalCoreHelper runOnMainThread:^{
+            [UIApplication sharedApplication].applicationIconBadgeNumber = badgeCount;
+        }];
+    }
+}
+
 - (void)dealloc {
     [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"OSNotificationsManager observer deallocated"];
     [[NSNotificationCenter defaultCenter] removeObserver:self];

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -749,9 +749,11 @@ + (void)onSessionEnding:(NSArray<OSInfluence *> *)lastInfluences {
 #pragma clang diagnostic ignored "-Wincomplete-implementation"
 @implementation UIApplication (OneSignal)
 + (void)load {
+    [OSDialogInstanceManager setSharedOSDialogInstance:[OneSignalDialogController sharedInstance]];
+    [OSNotificationsManager registerLifecycleObserver];
 
-    if ([self shouldDisableBasedOnProcessArguments]) {
-        [OneSignalLog onesignalLog:ONE_S_LL_WARN message:@"OneSignal method swizzling is disabled. Make sure the feature is enabled for production."];
+    if ([self shouldDisableSwizzling]) {
+        [OneSignalLog onesignalLog:ONE_S_LL_WARN message:@"OneSignal method swizzling is disabled via Info.plist. Developers must manually forward notification delegate methods to OneSignal."];
         return;
     }
     [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"UIApplication(OneSignal) LOADED!"];
@@ -784,8 +786,6 @@ + (void)load {
     [[OSMigrationController new] migrate];
 //    sessionLaunchTime = [NSDate date];
     // TODO: sessionLaunchTime used to always be set in load
-    
-    [OSDialogInstanceManager setSharedOSDialogInstance:[OneSignalDialogController sharedInstance]];
 }
 
 /*
@@ -797,8 +797,9 @@ - (void)onesignalSetApplicationIconBadgeNumber:(NSInteger)badge {
     [self onesignalSetApplicationIconBadgeNumber:badge];
 }
 
-+(BOOL) shouldDisableBasedOnProcessArguments {
-    if ([NSProcessInfo.processInfo.arguments containsObject:@"DISABLE_ONESIGNAL_SWIZZLING"]) {
++ (BOOL)shouldDisableSwizzling {
+    id plistValue = [[NSBundle mainBundle] objectForInfoDictionaryKey:ONESIGNAL_DISABLE_SWIZZLING];
+    if (plistValue != nil && [plistValue boolValue]) {
         return YES;
     }
     return NO;