Fixing dismissing lifecycle methods for IAMs with prompts

Author: emawby

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

@@ -662,8 +662,6 @@ void messageWasDismissed(@NonNull OSInAppMessageInternal message) {
     }
 
     void messageWasDismissed(@NonNull OSInAppMessageInternal message, boolean failed) {
-        if (!failed)
-            onMessageDidDismiss(message);
 
         if (!message.isPreview) {
             dismissedMessages.add(message.messageId);
@@ -679,6 +677,9 @@ void messageWasDismissed(@NonNull OSInAppMessageInternal message, boolean failed
             logger.debug("OSInAppMessageController messageWasDismissed dismissedMessages: " + dismissedMessages.toString());
         }
 
+        if (!shouldWaitForPromptsBeforeDismiss())
+            onMessageDidDismiss(message);
+
         dismissCurrentMessage(message);
     }
 
@@ -688,6 +689,10 @@ void messageWasDismissedByBackPress(@NonNull OSInAppMessageInternal message) {
         dismissCurrentMessage(message);
     }
 
+    private boolean shouldWaitForPromptsBeforeDismiss() {
+        return currentPrompt != null;
+    }
+
     /**
      * Removes first item from the queue and attempts to show the next IAM in the queue
      *
@@ -697,7 +702,7 @@ private void dismissCurrentMessage(@Nullable OSInAppMessageInternal message) {
         // Remove DIRECT influence due to ClickHandler of ClickAction outcomes
         OneSignal.getSessionManager().onDirectInfluenceFromIAMClickFinished();
 
-        if (currentPrompt != null) {
+        if (shouldWaitForPromptsBeforeDismiss()) {
             logger.debug("Stop evaluateMessageDisplayQueue because prompt is currently displayed");
             return;
         }

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

@@ -67,6 +67,8 @@ boolean isBanner() {
     @Nullable private String currentActivityName = null;
     private Integer lastPageHeight = null;
 
+    private boolean dismissing = false;
+
     interface OneSignalGenericCallback {
         void onComplete();
     }
@@ -448,7 +450,7 @@ private void removeActivityListener() {
      * Trigger the {@link #messageView} dismiss animation flow
      */
     protected void dismissAndAwaitNextMessage(@Nullable final OneSignalGenericCallback callback) {
-        if (messageView == null) {
+        if (messageView == null || dismissing) {
             if (callback != null)
                 callback.onComplete();
             return;
@@ -459,10 +461,12 @@ protected void dismissAndAwaitNextMessage(@Nullable final OneSignalGenericCallba
         messageView.dismissAndAwaitNextMessage(new OneSignalGenericCallback() {
             @Override
             public void onComplete() {
+                dismissing = false;
                 messageView = null;
                 if (callback != null)
                     callback.onComplete();
             }
         });
+        dismissing = true;
     }
 }