Merge pull request #1287 from OneSignal/user_model/fix_swizzling_subc…

…lasses Do not swizzle a subclass of an already swizzled class
OneSignal · Oct 30, 2023 · 4e24e72 · 4e24e72
2 parents 9daa536 + dbcd753
commit 4e24e72
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 3 deletions.
diff --git a/...ignalSDK/OneSignalNotifications/Categories/UIApplicationDelegate+OneSignalNotifications.m b/...ignalSDK/OneSignalNotifications/Categories/UIApplicationDelegate+OneSignalNotifications.m
@@ -34,6 +34,7 @@
 #import "OneSignalSelectorHelpers.h"
 #import "SwizzlingForwarder.h"
 #import "OSNotificationsManager.h"
+#import <objc/runtime.h>
 
 // This class hooks into the UIApplicationDelegate selectors to receive iOS 9 and older events.
 //   - UNUserNotificationCenter is used for iOS 10
@@ -58,7 +59,7 @@ - (void) setOneSignalDelegate:(id<UIApplicationDelegate>)delegate {
 
     Class delegateClass = [delegate class];
 
-    if (delegate == nil || [swizzledClasses containsObject:delegateClass]) {
+    if (delegate == nil || [OneSignalNotificationsAppDelegate swizzledClassInHeirarchy:delegateClass]) {
         [self setOneSignalDelegate:delegate];
         return;
     }
@@ -93,6 +94,22 @@ - (void) setOneSignalDelegate:(id<UIApplicationDelegate>)delegate {
     [self setOneSignalDelegate:delegate];
 }
 
++ (BOOL)swizzledClassInHeirarchy:(Class)delegateClass {
+    if ([swizzledClasses containsObject:delegateClass]) {
+        [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"OneSignal already swizzled %@", NSStringFromClass(delegateClass)]];
+        return true;
+    }
+    Class superClass = class_getSuperclass(delegateClass);
+    while(superClass) {
+        if ([swizzledClasses containsObject:superClass]) {
+            [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"OneSignal already swizzled %@ in super class: %@", NSStringFromClass(delegateClass), NSStringFromClass(superClass)]];
+            return true;
+        }
+        superClass = class_getSuperclass(superClass);
+    }
+    return false;
+}
+
 - (void)oneSignalDidRegisterForRemoteNotifications:(UIApplication*)app deviceToken:(NSData*)inDeviceToken {
     [OneSignalNotificationsAppDelegate traceCall:@"oneSignalDidRegisterForRemoteNotifications:deviceToken:"];
 

diff --git a/...alSDK/OneSignalNotifications/Categories/UNUserNotificationCenter+OneSignalNotifications.m b/...alSDK/OneSignalNotifications/Categories/UNUserNotificationCenter+OneSignalNotifications.m
@@ -33,6 +33,7 @@
 #import "UIApplicationDelegate+OneSignalNotifications.h"
 #import "OSNotificationsManager.h"
 #import <OneSignalCore/OneSignalCore.h>
+#import <objc/runtime.h>
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wundeclared-selector"
 
@@ -182,7 +183,7 @@ - (void) setOneSignalUNDelegate:(id)delegate {
 
     Class delegateClass = [delegate class];
 
-    if (delegate == nil || [OneSignalUNUserNotificationCenter swizzledClassInHeirarchy:delegateClass]) {
+    if (delegate == nil || [OneSignalNotificationsUNUserNotificationCenter swizzledClassInHeirarchy:delegateClass]) {
         [self setOneSignalUNDelegate:delegate];
         return;
     }

diff --git a/iOS_SDK/OneSignalSDK/Source/UIApplicationDelegate+OneSignal.m b/iOS_SDK/OneSignalSDK/Source/UIApplicationDelegate+OneSignal.m
@@ -80,6 +80,22 @@ - (void) setOneSignalDelegate:(id<UIApplicationDelegate>)delegate {
     [self setOneSignalDelegate:delegate];
 }
 
++ (BOOL)swizzledClassInHeirarchy:(Class)delegateClass {
+    if ([swizzledClasses containsObject:delegateClass]) {
+        [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"OneSignal already swizzled %@", NSStringFromClass(delegateClass)]];
+        return true;
+    }
+    Class superClass = class_getSuperclass(delegateClass);
+    while(superClass) {
+        if ([swizzledClasses containsObject:superClass]) {
+            [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"OneSignal already swizzled %@ in super class: %@", NSStringFromClass(delegateClass), NSStringFromClass(superClass)]];
+            return true;
+        }
+        superClass = class_getSuperclass(superClass);
+    }
+    return false;
+}
+
 -(void)oneSignalApplicationWillTerminate:(UIApplication *)application {
     [OneSignalAppDelegate traceCall:@"oneSignalApplicationWillTerminate:"];
 

diff --git a/iOS_SDK/OneSignalSDK/UnitTests/InAppMessagingIntegrationTests.m b/iOS_SDK/OneSignalSDK/UnitTests/InAppMessagingIntegrationTests.m
@@ -26,7 +26,7 @@ of this software and associated documentation files (the "Software"), to deal
  */
 
 #import <XCTest/XCTest.h>
-#import "OneSignal.h"
+#import "OneSignalFramework.h"
 #import "OneSignalUserDefaults.h"
 #import "OneSignalHelper.h"
 #import "OSInAppMessageInternal.h"