add back in preview IAMs

* Adding back preview IAM functionality
* Use Notification Center to send the preview IAM to the Messaging Controller as it lives in another module
* add Post Notification event name to Common Defines

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCommonDefines.h

@@ -152,6 +152,7 @@
 
 // APNS params
 #define ONESIGNAL_IAM_PREVIEW @"os_in_app_message_preview_id"
+#define ONESIGNAL_POST_PREVIEW_IAM @"ONESIGNAL_POST_PREVIEW_IAM"
 
 #define ONESIGNAL_SUPPORTED_ATTACHMENT_TYPES @[@"aiff", @"wav", @"mp3", @"mp4", @"jpg", @"jpeg", @"png", @"gif", @"mpeg", @"mpg", @"avi", @"m4a", @"m4v"]
 

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m

@@ -562,7 +562,7 @@ + (void)notificationReceived:(NSDictionary*)messageDict wasOpened:(BOOL)opened {
         [self handleNotificationOpened:messageDict actionType:type];
     } else if (isPreview && [OSDeviceUtils isIOSVersionGreaterThanOrEqual:@"10.0"]) {
         let notification = [OSNotification parseWithApns:messageDict];
-        //[OneSignalHelper handleIAMPreview:notification]; //TODO: setup a notification center notif for this
+        [self handleIAMPreview:notification];
     }
 }
 
@@ -738,10 +738,9 @@ + (BOOL)clearBadgeCount:(BOOL)fromNotifOpened {
 + (BOOL)handleIAMPreview:(OSNotification *)notification {
     NSString *uuid = [notification additionalData][ONESIGNAL_IAM_PREVIEW];
     if (uuid) {
-
         [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"IAM Preview Detected, Begin Handling"];
-//        OSInAppMessageInternal *message = [OSInAppMessageInternal instancePreviewFromNotification:notification];
-//        [[OSMessagingController sharedInstance] presentInAppPreviewMessage:message]; //TODO: Post to notification center for IAM to handle
+        NSDictionary *userInfo = [NSDictionary dictionaryWithObject:notification forKey:@"notification"];
+        [[NSNotificationCenter defaultCenter] postNotificationName:ONESIGNAL_POST_PREVIEW_IAM object:nil userInfo:userInfo];
         return YES;
     }
     return NO;

iOS_SDK/OneSignalSDK/Source/OSMessagingController.h

@@ -51,7 +51,6 @@ NS_ASSUME_NONNULL_BEGIN
 + (void)start;
 + (void)removeInstance;
 - (void)presentInAppMessage:(OSInAppMessageInternal *)message;
-- (void)presentInAppPreviewMessage:(OSInAppMessageInternal *)message;
 - (void)updateInAppMessagesFromCache;
 - (void)getInAppMessagesFromServer:(NSString * _Nullable)subscriptionId;
 - (void)messageViewImpressionRequest:(OSInAppMessageInternal *)message;

iOS_SDK/OneSignalSDK/Source/OSMessagingController.m

@@ -159,6 +159,8 @@ - (instancetype)init {
         self.isAppInactive = NO;
         // BOOL that controls if in-app messaging is paused or not (false by default)
         _isInAppMessagingPaused = false;
+        
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleIAMPreview:) name:ONESIGNAL_POST_PREVIEW_IAM object:nil];
     }
 
     return self;
@@ -311,6 +313,12 @@ - (void)onDidDismissInAppMessage:(OSInAppMessageInternal *)message {
     }
 }
 
+- (void)handleIAMPreview:(NSNotification *)nsNotification {
+    OSNotification *notification = [nsNotification.userInfo objectForKey:@"notification"];
+    OSInAppMessageInternal *message = [OSInAppMessageInternal instancePreviewFromNotification:notification];
+    [self presentInAppPreviewMessage:message];
+}
+
 - (void)presentInAppMessage:(OSInAppMessageInternal *)message {
     if (!message.variantId) {
         let errorMessage = [NSString stringWithFormat:@"Attempted to display a message with a nil variantId. Current preferred language is %@, supported message variants are %@", OneSignalUserManagerImpl.sharedInstance.language, message.variants];
@@ -982,6 +990,10 @@ - (void)onOSPushSubscriptionChangedWithStateChanges:(OSPushSubscriptionStateChan
     [self getInAppMessagesFromServer:stateChanges.to.id];
 }
 
+- (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
 @end
 
 @implementation DummyOSMessagingController