Merge pull request #1326 from OneSignal/5.x.x/fix/forward_opens_from_non_onesignal_notifs

[v5] Fix forwarding notification opens from non onesignal notifs

Author: nan-li

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

@@ -308,35 +308,11 @@ void finishProcessingNotification(UNNotification *notification,
     completionHandler(completionHandlerOptions);
 }
 
-// Apple's docs - Called to let your app know which action was selected by the user for a given notification.
-- (void)onesignalUserNotificationCenter:(UNUserNotificationCenter *)center
-         didReceiveNotificationResponse:(UNNotificationResponse *)response
-                  withCompletionHandler:(void(^)(void))completionHandler {
-    [OneSignalNotificationsUNUserNotificationCenter traceCall:@"onesignalUserNotificationCenter:didReceiveNotificationResponse:withCompletionHandler:"];
-    // return if the user has not granted privacy permissions or if not a OneSignal payload
-    if ([OSPrivacyConsentController shouldLogMissingPrivacyConsentErrorWithMethodName:nil] || ![OneSignalCoreHelper isOneSignalPayload:response.notification.request.content.userInfo]) {
-        SwizzlingForwarder *forwarder = [[SwizzlingForwarder alloc]
-            initWithTarget:self
-            withYourSelector:@selector(
-                onesignalUserNotificationCenter:didReceiveNotificationResponse:withCompletionHandler:
-            )
-            withOriginalSelector:@selector(
-                userNotificationCenter:didReceiveNotificationResponse:withCompletionHandler:
-            )
-        ];
-        if (forwarder.hasReceiver) {
-            [forwarder invokeWithArgs:@[center, response, completionHandler]];
-        } else {
-            completionHandler();
-        }
-        return;
-    }
-    
-    [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"onesignalUserNotificationCenter:didReceiveNotificationResponse:withCompletionHandler: Fired!"];
-    
-    [OneSignalNotificationsUNUserNotificationCenter processiOS10Open:response];
-    
-    // Call orginal selector if one was set.
++ (void)forwardReceivedNotificationResponseWithCenter:(UNUserNotificationCenter *)center
+                       didReceiveNotificationResponse:(UNNotificationResponse *)response
+                                      OneSignalCenter:(id)instance
+                                withCompletionHandler:(void(^)(void))completionHandler {
+    // Call original selector if one was set.
     SwizzlingForwarder *forwarder = [[SwizzlingForwarder alloc]
         initWithTarget:instance
         withYourSelector:@selector(
@@ -365,20 +341,19 @@ - (void)onesignalUserNotificationCenter:(UNUserNotificationCenter *)center
         completionHandler();
 }
 
-
 // Apple's docs - Called to let your app know which action was selected by the user for a given notification.
 - (void)onesignalUserNotificationCenter:(UNUserNotificationCenter *)center
          didReceiveNotificationResponse:(UNNotificationResponse *)response
-                  withCompletionHandler:(void(^)())completionHandler {
-    [OneSignalUNUserNotificationCenter traceCall:@"onesignalUserNotificationCenter:didReceiveNotificationResponse:withCompletionHandler:"];
-    
-    if (![OSPrivacyConsentController shouldLogMissingPrivacyConsentErrorWithMethodName:nil] && [OneSignalHelper isOneSignalPayload:response.notification.request.content.userInfo]) {
-        [OneSignal onesignalLog:ONE_S_LL_VERBOSE message:@"onesignalUserNotificationCenter:didReceiveNotificationResponse:withCompletionHandler: Fired!"];
-        
-        [OneSignalUNUserNotificationCenter processiOS10Open:response];
+                  withCompletionHandler:(void(^)(void))completionHandler {
+    [OneSignalNotificationsUNUserNotificationCenter traceCall:@"onesignalUserNotificationCenter:didReceiveNotificationResponse:withCompletionHandler:"];
+
+    if (![OSPrivacyConsentController shouldLogMissingPrivacyConsentErrorWithMethodName:nil] && [OneSignalCoreHelper isOneSignalPayload:response.notification.request.content.userInfo]) {
+        [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"onesignalUserNotificationCenter:didReceiveNotificationResponse:withCompletionHandler: Fired!"];
+
+        [OneSignalNotificationsUNUserNotificationCenter processiOS10Open:response];
     }
-    
-    [OneSignalUNUserNotificationCenter forwardReceivedNotificationResponseWithCenter:center didReceiveNotificationResponse:response OneSignalCenter:self withCompletionHandler:completionHandler];
+
+    [OneSignalNotificationsUNUserNotificationCenter forwardReceivedNotificationResponseWithCenter:center didReceiveNotificationResponse:response OneSignalCenter:self withCompletionHandler:completionHandler];
 }
 
 + (BOOL)isDismissEvent:(UNNotificationResponse *)response {

iOS_SDK/OneSignalSDK/UnitTests/UIApplicationDelegateSwizzlingTests.m

@@ -566,7 +566,7 @@ - (UNNotificationResponse*)createOneSignalNotificationResponse {
   id userInfo = @{@"custom":
                        @{ @"i": @"b2f7f966-d8cc-11e4-bed1-df8f05be55ba" }
                 };
-  
+
   return [UnitTestCommonMethods createBasiciOSNotificationResponseWithPayload:userInfo];
 }
 
@@ -575,7 +575,6 @@ - (UNNotificationResponse*)createNonOneSignalNotificationResponse {
 }
 
 - (void)testNotificationOpenForwardsToLegacySelector {
-    
     AppDelegateForExistingSelectorsTest* myAppDelegate = [AppDelegateForExistingSelectorsTest new];
     UIApplication.sharedApplication.delegate = myAppDelegate;
 
@@ -590,9 +589,7 @@ - (void)testNotificationOpenForwardsToLegacySelector {
         )
     ]);
     XCTAssertEqual([OneSignalAppDelegateOverrider callCountForSelector:@"oneSignalReceiveRemoteNotification:UserInfo:fetchCompletionHandler:"], 1);
-    
-    
-    
+
     notifResponse = [self createNonOneSignalNotificationResponse];
     notifCenter = [UNUserNotificationCenter currentNotificationCenter];
     notifCenterDelegate = notifCenter.delegate;
@@ -604,7 +601,6 @@ - (void)testNotificationOpenForwardsToLegacySelector {
         )
     ]);
     XCTAssertEqual([OneSignalAppDelegateOverrider callCountForSelector:@"oneSignalReceiveRemoteNotification:UserInfo:fetchCompletionHandler:"], 2);
-    
 }
 
 - (void)testAppDelegateInheritsFromBaseMissingSelectors {