Fix dismiss iam causing action (#841)

* Fixing an issue with dragging IAM and the JS action triggering
* Added two callbacks to toggle the state of dragging for an IAM messageView (DraggableRelativeLayout)
* onDraggingStart will set the Boolean flag true and onDraggingEnd will set the flag false
* When isDragging is true the JS action not be fired and is triggered by passing a specific drag threshold
* isDragging is set false when touch down is detected on the DraggableRelativeLayout

This is not finished currently, needs more detailed testing and clean up
* This functionality will differentiate up and down direction of drag
* Will account for all IAM types (top, bottom, center, full screen)

* Wrapping up with dragging action issue with IAM
* Added a dragThresholdY param to the DraggableRelativeLayout to create callback handling for onDraggingStart and onDraggingEnd
* We have to calculate the threshold for each IAM type since top, bottom, center, and full screen all have different Y positions

* Clean up after review
* Wasn't adding threshold to the center modals and full screen IAMs
* Changed DraggableListener to an interface and shortened names of onDragStart and onDragEnd
* Added comments and minor clean up to callbacks being triggered

* Update DraggableRelativeLayout.java

Author: mikechoch

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

@@ -16,8 +16,13 @@ class DraggableRelativeLayout extends RelativeLayout {
    private static final int MARGIN_PX_SIZE = dpToPx(28);
    private static final int EXTRA_PX_DISMISS = dpToPx(64);
 
-   static abstract class DraggableListener {
-      void onDismiss() {}
+   interface DraggableListener {
+      // Callback for dismissing the MessageView
+      void onDismiss();
+
+      // Callbacks for knowing when dragging has started and ended
+      void onDragStart();
+      void onDragEnd();
    }
 
    private DraggableListener mListener;
@@ -30,6 +35,7 @@ static class Params {
 
       int posY;
       int maxYPos;
+      int dragThresholdY; // Y value associated with trigger for onDragStart() callback
       int maxXPos;
       int height;
       int messageHeight;
@@ -81,10 +87,20 @@ public boolean tryCaptureView(@NonNull View child, int pointerId) {
          public int clampViewPositionVertical(@NonNull View child, int top, int dy) {
             lastYPos = top;
             if (params.dragDirection == Params.DRAGGABLE_DIRECTION_DOWN) {
+               // Dragging down
+               // If the top of the message is past the dragThresholdY trigger the onDragStart() callback
+               if (top >= params.dragThresholdY && mListener != null)
+                  mListener.onDragStart();
+
                if (top < params.maxYPos)
                   return params.maxYPos;
             }
             else {
+               // Dragging up
+               // If the top of the message is past the dragThresholdY trigger the onDragStart() callback
+               if (top <= params.dragThresholdY && mListener != null)
+                  mListener.onDragStart();
+
                if (top > params.maxYPos)
                   return params.maxYPos;
             }
@@ -105,14 +121,18 @@ public void onViewReleased(@NonNull View releasedChild, float xvel, float yvel)
                   if (lastYPos > params.dismissingYPos || yvel > params.dismissingYVelocity) {
                      settleDestY = params.offScreenYPos;
                      dismissing = true;
-                     if (mListener != null) { mListener.onDismiss(); }
+
+                     if (mListener != null)
+                        mListener.onDismiss();
                   }
                }
                else {
                   if (lastYPos < params.dismissingYPos || yvel < params.dismissingYVelocity) {
                      settleDestY = params.offScreenYPos;
                      dismissing = true;
-                     if (mListener != null) { mListener.onDismiss(); }
+
+                     if (mListener != null)
+                        mListener.onDismiss();
                   }
                }
             }
@@ -129,6 +149,25 @@ public boolean onInterceptTouchEvent(MotionEvent event) {
       if (dismissing)
          return true;
 
+      // Override our own touch event actions on the view
+      switch (event.getAction()) {
+         case MotionEvent.ACTION_DOWN:
+         case MotionEvent.ACTION_POINTER_DOWN:
+            // On touch downs we want to trigger the onDragEnd() callback
+
+            // This seems confusing, but because the JS action within the WebView will trigger on
+            // touch up we need to stay in the onDragStart() state
+
+            // The fix for this is using on touch down to go to onDragEnd() state since we can
+            // confirm that the view will be at its origin position
+
+            // Therefore, the logic inside of onDragEnd() would be executed before touch up
+            // again and our JS action will execute properly
+            if (mListener != null)
+               mListener.onDragEnd();
+            break;
+      }
+
       mDragHelper.processTouchEvent(event);
 
       // Let child views get all touch events;

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

@@ -53,6 +53,7 @@ class InAppMessageView {
     private static final int ACTIVITY_FINISH_AFTER_DISMISS_DELAY_MS = 600;
     private static final int ACTIVITY_INIT_DELAY = 200;
     private static final int MARGIN_PX_SIZE = dpToPx(24);
+    private static final int DRAG_THRESHOLD_PX_SIZE = dpToPx(4);
     private PopupWindow popupWindow;
 
     interface InAppMessageViewListener {
@@ -67,6 +68,7 @@ interface InAppMessageViewListener {
     private double dismissDuration;
     private boolean hasBackground;
     private boolean shouldDismissWhenActive = false;
+    private boolean isDragging = false;
     @NonNull private WebViewManager.Position displayLocation;
     private WebView webView;
     private RelativeLayout parentRelativeLayout;
@@ -191,17 +193,22 @@ private DraggableRelativeLayout.Params createDraggableLayoutParams(int pageHeigh
         draggableParams.messageHeight = pageHeight;
         draggableParams.height = getDisplayYSize();
 
-        if (displayLocation == WebViewManager.Position.FULL_SCREEN)
-            draggableParams.messageHeight = pageHeight = getDisplayYSize() - (MARGIN_PX_SIZE * 2);
-
         switch (displayLocation) {
+            case TOP_BANNER:
+                draggableParams.dragThresholdY = MARGIN_PX_SIZE - DRAG_THRESHOLD_PX_SIZE;
+                break;
             case BOTTOM_BANNER:
                 draggableParams.posY = getDisplayYSize() - pageHeight;
+                draggableParams.dragThresholdY = MARGIN_PX_SIZE + DRAG_THRESHOLD_PX_SIZE;
                 break;
-            case CENTER_MODAL:
             case FULL_SCREEN:
-                draggableParams.maxYPos = (getDisplayYSize() / 2) - (pageHeight / 2);
-                draggableParams.posY = (getDisplayYSize() / 2) - (pageHeight / 2);
+                draggableParams.messageHeight = pageHeight = getDisplayYSize() - (MARGIN_PX_SIZE * 2);
+                // fall through for FULL_SCREEN since it shares similar params to CENTER_MODAL
+            case CENTER_MODAL:
+                int y = (getDisplayYSize() / 2) - (pageHeight / 2);
+                draggableParams.dragThresholdY = y + DRAG_THRESHOLD_PX_SIZE;
+                draggableParams.maxYPos = y;
+                draggableParams.posY = y;
                 break;
         }
 
@@ -288,7 +295,7 @@ private void setUpParentLinearLayout(Context context) {
         parentRelativeLayout.addView(draggableRelativeLayout);
     }
 
-    private void setUpDraggableLayout(Context context,
+    private void setUpDraggableLayout(final Context context,
                                       LinearLayout.LayoutParams linearLayoutParams,
                                       DraggableRelativeLayout.Params draggableParams) {
         draggableRelativeLayout = new DraggableRelativeLayout(context);
@@ -297,9 +304,19 @@ private void setUpDraggableLayout(Context context,
         draggableRelativeLayout.setParams(draggableParams);
         draggableRelativeLayout.setListener(new DraggableRelativeLayout.DraggableListener() {
             @Override
-            void onDismiss() {
+            public void onDismiss() {
                 finishAfterDelay(null);
             }
+
+            @Override
+            public void onDragStart() {
+                isDragging = true;
+            }
+
+            @Override
+            public void onDragEnd() {
+                isDragging = false;
+            }
         });
 
         if (webView.getParent() != null)
@@ -314,6 +331,13 @@ void onDismiss() {
         draggableRelativeLayout.addView(cardView);
     }
 
+    /**
+     * Simple getter to know when the MessageView is in a dragging state
+     */
+    boolean isDragging() {
+        return isDragging;
+    }
+
     /**
      * To show drop shadow on WebView
      * Layout container for WebView is needed

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

@@ -161,8 +161,10 @@ public void postMessage(String message) {
 
                 if (messageType.equals(EVENT_TYPE_RENDERING_COMPLETE))
                     handleRenderComplete(jsonObject);
-                else if (messageType.equals(EVENT_TYPE_ACTION_TAKEN))
+                else if (messageType.equals(EVENT_TYPE_ACTION_TAKEN) && !messageView.isDragging()) {
+                    // Added handling so that click actions won't trigger while dragging the IAM
                     handleActionTaken(jsonObject);
+                }
             } catch (JSONException e) {
                 e.printStackTrace();
             }