Moved onMessageWasShown to onAnimationEnd

- Seems to work fine for IAM and carousel
- Known issue with prompts (problems around dismiss)

Author: nan-li

Examples/OneSignalDemo/app/src/main/java/com/onesignal/sdktest/application/MainApplication.java

@@ -25,19 +25,19 @@ public void onCreate() {
         OSIAMLifecycleHandler handler = new OSIAMLifecycleHandler() {
             @Override
             public void onWillDisplayInAppMessage(OSInAppMessage message) {
-                return;
+                OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "MainApplication onWillDisplayInAppMessage");
             }
             @Override
             public void onDidDisplayInAppMessage(OSInAppMessage message) {
-                return;
+                OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "MainApplication onDidDisplayInAppMessage");
             }
             @Override
             public void onWillDismissInAppMessage(OSInAppMessage message) {
-                return;
+                OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "MainApplication onWillDismissInAppMessage");
             }
             @Override
             public void onDidDismissInAppMessage(OSInAppMessage message) {
-                return;
+                OneSignal.onesignalLog(OneSignal.LOG_LEVEL.VERBOSE, "MainApplication onDidDismissInAppMessage");
             }
         };
 

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

@@ -61,6 +61,7 @@ class InAppMessageView {
 
     interface InAppMessageViewListener {
         void onMessageWasShown();
+        void onMessageWillDismiss();
         void onMessageWasDismissed();
     }
 
@@ -243,7 +244,6 @@ public void run() {
 
                 if (messageController != null) {
                     animateInAppMessage(displayLocation, draggableRelativeLayout, parentRelativeLayout);
-                    messageController.onMessageWasShown();
                 }
 
                 startDismissTimerIfNeeded();
@@ -310,6 +310,9 @@ private void setUpDraggableLayout(final Context context,
         draggableRelativeLayout.setListener(new DraggableRelativeLayout.DraggableListener() {
             @Override
             public void onDismiss() {
+                if (messageController != null) {
+                    messageController.onMessageWillDismiss();
+                }
                 finishAfterDelay(null);
             }
 
@@ -489,9 +492,7 @@ private void dereferenceViews() {
     private void animateInAppMessage(WebViewManager.Position displayLocation, View messageView, View backgroundView) {
         final CardView messageViewCardView = messageView.findViewWithTag(IN_APP_MESSAGE_CARD_VIEW_TAG);
 
-        Animation.AnimationListener cardViewAnimCallback = null;
-        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.M)
-            cardViewAnimCallback = createAnimationListenerForAndroidApi23Elevation(messageViewCardView);
+        Animation.AnimationListener cardViewAnimCallback = createAnimationListener(messageViewCardView);
 
         // Based on the location of the in app message apply and animation to match
         switch (displayLocation) {
@@ -508,7 +509,7 @@ private void animateInAppMessage(WebViewManager.Position displayLocation, View m
         }
     }
 
-    private Animation.AnimationListener createAnimationListenerForAndroidApi23Elevation(final CardView messageViewCardView) {
+    private Animation.AnimationListener createAnimationListener(final CardView messageViewCardView) {
         return new Animation.AnimationListener() {
             @Override
             public void onAnimationStart(Animation animation) {
@@ -518,7 +519,12 @@ public void onAnimationStart(Animation animation) {
             @Override
             public void onAnimationEnd(Animation animation) {
                 // For Android 6 API 23 devices, waits until end of animation to set elevation of CardView class
-                messageViewCardView.setCardElevation(dpToPx(5));
+                if (Build.VERSION.SDK_INT == Build.VERSION_CODES.M) {
+                    messageViewCardView.setCardElevation(dpToPx(5));
+                }
+                if (messageController != null) {
+                    messageController.onMessageWasShown();
+                }
             }
 
             @Override

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

@@ -235,9 +235,6 @@ private void handleActionTaken(JSONObject jsonObject) throws JSONException {
 
             boolean close = body.getBoolean("close");
             if (close) {
-                if (message != null) {
-                    OneSignal.getInAppMessageController().onMessageWillDismiss(message);
-                }
                 dismissAndAwaitNextMessage(null);
             }
         }
@@ -408,6 +405,11 @@ public void onMessageWasShown() {
                 OneSignal.getInAppMessageController().onMessageWasShown(message);
             }
 
+            @Override
+            public void onMessageWillDismiss() {
+                OneSignal.getInAppMessageController().onMessageWillDismiss(message);
+            }
+
             @Override
             public void onMessageWasDismissed() {
                 OneSignal.getInAppMessageController().messageWasDismissed(message);
@@ -451,7 +453,9 @@ protected void dismissAndAwaitNextMessage(@Nullable final OneSignalGenericCallba
                 callback.onComplete();
             return;
         }
-
+        if (message != null && messageView != null) {
+            OneSignal.getInAppMessageController().onMessageWillDismiss(message);
+        }
         messageView.dismissAndAwaitNextMessage(new OneSignalGenericCallback() {
             @Override
             public void onComplete() {