Remote Delegate Parameter

• Removes the `withDefaultDisplayType` convenience parameter from `OSNotificationDisplayTypeDelegate`'s `willPresentInFocusNotificationWithPayload:withCompletion` method
• This parameter was provided as a convenience for developers so that if they wanted to use the existing default display type, they could just call the callback with this value
• However to simplify things we will remove it, and developers can just call the callback with OneSignal.inFocusDisplayType to achieve the same goal

Author: Nightsd01

iOS_SDK/OneSignalSDK/Source/OneSignal.h

@@ -219,7 +219,6 @@ typedef void (^OSNotificationDisplayTypeResponse)(OSNotificationDisplayType disp
 // Allows apps to customize per-notification display-type
 @protocol OSNotificationDisplayTypeDelegate <NSObject>
 - (void)willPresentInFocusNotificationWithPayload:(OSNotificationPayload *)payload
-                           withDefaultDisplayType:(OSNotificationDisplayType)displayType
                                    withCompletion:(OSNotificationDisplayTypeResponse)completion;
 @end
 

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -1800,7 +1800,7 @@ + (void)displayTypeForNotificationPayload:(NSDictionary *)payload withCompletion
                                                                     userInfo:notificationId
                                                                      repeats:false];
 
-            [_displayDelegate willPresentInFocusNotificationWithPayload:osPayload withDefaultDisplayType:type withCompletion:^(OSNotificationDisplayType displayType) {
+            [_displayDelegate willPresentInFocusNotificationWithPayload:osPayload withCompletion:^(OSNotificationDisplayType displayType) {
                 [OneSignalHelper runOnMainThread:^{
                     NSMutableArray<OSNotificationDisplayTypeResponse> *callbacks = _pendingDisplayTypeCallbacks[notificationId];
 

iOS_SDK/OneSignalSDK/Source/OneSignalCommonDefines.h

@@ -149,7 +149,7 @@ typedef enum {GET, POST, HEAD, PUT, DELETE, OPTIONS, CONNECT, TRACE} HTTPMethod;
 
     // Defines how long the SDK will wait for OSNotificationDisplayTypeDelegate to execute
     // the callback to set the display type for a given notification
-    #define CUSTOM_DISPLAY_TYPE_TIMEOUT 0.2
+    #define CUSTOM_DISPLAY_TYPE_TIMEOUT 0.05
 #endif
 
 // A max timeout for a request, which might include multiple reattempts

iOS_SDK/OneSignalSDK/UnitTests/DummyNotificationDisplayTypeDelegate.m

@@ -39,7 +39,8 @@ - (instancetype)init {
     return self;
 }
 
-- (void)willPresentInFocusNotificationWithPayload:(OSNotificationPayload *)payload withDefaultDisplayType:(OSNotificationDisplayType)displayType withCompletion:(OSNotificationDisplayTypeResponse)completion {
+- (void)willPresentInFocusNotificationWithPayload:(OSNotificationPayload *)payload
+                                   withCompletion:(OSNotificationDisplayTypeResponse)completion {
     _notificationId = payload.notificationID;
 
     if (_shouldFireCompletionBlock)