calling willDismiss and didDismiss

Author: emawby

iOS_SDK/OneSignalSDK/Source/OSInAppMessageViewController.h

@@ -38,7 +38,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)messageViewDidSelectAction:(OSInAppMessageInternal *)message withAction:(OSInAppMessageAction *)action;
 - (void)messageViewDidDisplayPage:(OSInAppMessageInternal *)message withPageId:(NSString *)pageId;
-- (void)messageViewControllerWasDismissed;
+- (void)messageViewControllerWillDismiss:(OSInAppMessageInternal *)message;
+- (void)messageViewControllerWasDismissed:(OSInAppMessageInternal *)message displayed:(BOOL)displayed;
 - (void)webViewContentFinishedLoading:(OSInAppMessageInternal *)message;
 - (void)messageIsNotActive:(OSInAppMessageInternal *)message;
 - (void)messageWillDisplay:(OSInAppMessageInternal *)message;

iOS_SDK/OneSignalSDK/Source/OSInAppMessageViewController.m

@@ -431,10 +431,12 @@ - (void)dismissCurrentInAppMessage:(BOOL)up withVelocity:(double)velocity {
     // and we should bypass dismissal adjustments and animations and skip straight to the OSMessagingController callback for dismissing
     if (!self.didPageRenderingComplete) {
         [self dismissViewControllerAnimated:false completion:nil];
-        [self.delegate messageViewControllerWasDismissed];
+        [self.delegate messageViewControllerWasDismissed:self.message displayed:NO];
         return;
     }
 
+    [self.delegate messageViewControllerWillDismiss:self.message];
+    
     // Inactivate the current Y constraints
     self.finalYConstraint.active = false;
     self.initialYConstraint.active = false;
@@ -473,7 +475,7 @@ - (void)dismissCurrentInAppMessage:(BOOL)up withVelocity:(double)velocity {
             return;
 
         self.didPageRenderingComplete = false;
-        [self.delegate messageViewControllerWasDismissed];
+        [self.delegate messageViewControllerWasDismissed:self.message displayed:YES];
     }];
 }
 
@@ -754,7 +756,7 @@ - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id <UIV
 
 #pragma mark OSInAppMessageViewDelegate Methods
 - (void)messageViewFailedToLoadMessageContent {
-    [self.delegate messageViewControllerWasDismissed];
+    [self.delegate messageViewControllerWasDismissed:self.message displayed:NO];
 }
 
 - (void)messageViewDidFailToProcessAction {

iOS_SDK/OneSignalSDK/Source/OSMessagingController.m

@@ -572,14 +572,17 @@ - (id)getTriggerValueForKey:(NSString *)key {
 }
 
 #pragma mark OSInAppMessageViewControllerDelegate Methods
-- (void)messageViewControllerWasDismissed {
+- (void)messageViewControllerWasDismissed:(OSInAppMessageInternal *)message displayed:(BOOL)displayed {
     @synchronized (self.messageDisplayQueue) {
         [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"Dismissing IAM and preparing to show next IAM"];
         // Remove DIRECT influence due to ClickHandler of ClickAction outcomes
         [OneSignal.sessionManager onDirectInfluenceFromIAMClickFinished];
 
         // Add current dismissed messageId to seenInAppMessages set and save it to NSUserDefaults
         if (self.isInAppMessageShowing) {
+            if (displayed) {
+                [self onDidDismissInAppMessage:message];
+            }
             OSInAppMessageInternal *showingIAM = self.messageDisplayQueue.firstObject;
             [self.seenInAppMessages addObject:showingIAM.messageId];
             [OneSignalUserDefaults.initStandard saveSetForKey:OS_IAM_SEEN_SET_KEY withValue:self.seenInAppMessages];
@@ -601,6 +604,10 @@ - (void)messageViewControllerWasDismissed {
     }
 }
 
+- (void)messageViewControllerWillDismiss:(OSInAppMessageInternal *)message {
+    [self onWillDismissInAppMessage:message];
+}
+
 - (void)evaluateMessageDisplayQueue {
     [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"Evaluating message display queue"];
     // No IAMs are showing currently