Call willDisplay, didDisplay, didDismiss IAM methods

Utilizing existing WebViewManager callbacks

Author: nan-li

OneSignalSDK/onesignal/src/main/java/com/onesignal/OSInAppMessageController.java

@@ -284,6 +284,9 @@ public void run() {
     }
 
     void onMessageWasShown(@NonNull final OSInAppMessageInternal message) {
+
+        onMessageDidDisplay(message);
+
         if (message.isPreview)
             return;
 
@@ -344,39 +347,44 @@ void onMessageActionOccurredOnPreview(@NonNull final OSInAppMessageInternal mess
         logInAppMessagePreviewActions(action);
     }
 
-    /* IAM Lifecycle */
+    /**
+     * IAM Lifecycle methods
+     * The following methods call the public inAppMessageLifecycleHandler callbacks
+     */
     void onMessageWillDisplay(@NonNull final OSInAppMessageInternal message) {
         if (OneSignal.inAppMessageLifecycleHandler == null) {
-            OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "OSInAppMessageController onMessageWillDisplay: inAppMessageLifecycleHandler is null");
+            logger.verbose("OSInAppMessageController onMessageWillDisplay: inAppMessageLifecycleHandler is null");
             return;
         }
         OneSignal.inAppMessageLifecycleHandler.onWillDisplayInAppMessage(message);
     }
 
     void onMessageDidDisplay(@NonNull final OSInAppMessageInternal message) {
         if (OneSignal.inAppMessageLifecycleHandler == null) {
-            OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "OSInAppMessageController onMessageDidDisplay: inAppMessageLifecycleHandler is null");
+            logger.verbose("OSInAppMessageController onMessageDidDisplay: inAppMessageLifecycleHandler is null");
             return;
         }
         OneSignal.inAppMessageLifecycleHandler.onDidDisplayInAppMessage(message);
     }
 
     void onMessageWillDismiss(@NonNull final OSInAppMessageInternal message) {
         if (OneSignal.inAppMessageLifecycleHandler == null) {
-            OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "OSInAppMessageController onMessageWillDismiss: inAppMessageLifecycleHandler is null");
+            logger.verbose("OSInAppMessageController onMessageWillDismiss: inAppMessageLifecycleHandler is null");
             return;
         }
         OneSignal.inAppMessageLifecycleHandler.onWillDismissInAppMessage(message);
     }
 
     void onMessageDidDismiss(@NonNull final OSInAppMessageInternal message) {
         if (OneSignal.inAppMessageLifecycleHandler == null) {
-            OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "OSInAppMessageController onMessageDidDismiss: inAppMessageLifecycleHandler is null");
+            logger.verbose("OSInAppMessageController onMessageDidDismiss: inAppMessageLifecycleHandler is null");
             return;
         }
         OneSignal.inAppMessageLifecycleHandler.onDidDismissInAppMessage(message);
     }
 
+    /* End IAM Lifecycle methods */
+
     private void logInAppMessagePreviewActions(final OSInAppMessageAction action) {
         if (action.getTags() != null)
             logger.debug("Tags detected inside of the action click payload, ignoring because action came from IAM preview:: " + action.getTags().toString());
@@ -654,6 +662,9 @@ void messageWasDismissed(@NonNull OSInAppMessageInternal message) {
     }
 
     void messageWasDismissed(@NonNull OSInAppMessageInternal message, boolean failed) {
+        if (!failed)
+            onMessageDidDismiss(message);
+
         if (!message.isPreview) {
             dismissedMessages.add(message.messageId);
             // If failed we will retry on next session
@@ -791,6 +802,7 @@ public void onSuccess(String response) {
                                 return;
                             }
                             OneSignal.getSessionManager().onInAppMessageReceived(message.messageId);
+                            onMessageWillDisplay(message);
                             WebViewManager.showHTMLString(message, taggedHTMLString(htmlStr));
                         } catch (JSONException e) {
                             e.printStackTrace();