diff --git a/src/gui/view/gesturedetector.cc b/src/gui/view/gesturedetector.cc
index 2c0b7325..5356f699 100644
--- a/src/gui/view/gesturedetector.cc
+++ b/src/gui/view/gesturedetector.cc
@@ -69,7 +69,7 @@ void GestureDetector::init(Context* context) {
     if(InputEventConsistencyVerifier::isInstrumentationEnabled())
          mInputEventConsistencyVerifier = new InputEventConsistencyVerifier((Object*)this, 0) ;
     mPressRunnable = [this](){
-        mListener.onShowPress(*mCurrentDownEvent);
+        if(mListener.onShowPress)mListener.onShowPress(*mCurrentDownEvent);
     };
     mLongPressRunnable=[this](){
         //recordGestureClassification(msg.arg1);
diff --git a/src/gui/view/view.cc b/src/gui/view/view.cc
index 2b8b6a87..e05b68d9 100755
--- a/src/gui/view/view.cc
+++ b/src/gui/view/view.cc
@@ -7035,7 +7035,7 @@ void View::playSoundEffect(int soundConstant){
 }
 
 bool View::performHapticFeedback(int feedbackConstant, int flags){
-    if (mAttachInfo == nullptr) {
+    if ((mAttachInfo == nullptr)||(mAttachInfo->mPerformHapticFeedback==nullptr)) {
         return false;
     }
     //noinspection SimplifiableIfStatement
diff --git a/src/gui/widgetEx/recyclerview/itemtouchhelper.cc b/src/gui/widgetEx/recyclerview/itemtouchhelper.cc
index c73d4c7b..f6b5b28f 100755
--- a/src/gui/widgetEx/recyclerview/itemtouchhelper.cc
+++ b/src/gui/widgetEx/recyclerview/itemtouchhelper.cc
@@ -9,6 +9,7 @@ ItemTouchHelper::ItemTouchHelper(Callback* callback) {
     mVelocityTracker = nullptr;
     mSwipeEscapeVelocity = 120;
     mMaxSwipeVelocity = 800;
+    mGestureDetector = nullptr;
     mScrollRunnable = [this]() {
         if ((mSelected != nullptr) && scrollIfNecessary()) {
             if (mSelected != nullptr) { //it might be lost during scrolling
@@ -27,7 +28,7 @@ ItemTouchHelper::ItemTouchHelper(Callback* callback) {
 }
 
 bool ItemTouchHelper::onInterceptTouchEvent(RecyclerView& recyclerView,MotionEvent& event) {
-    //mGestureDetector.onTouchEvent(event);
+    mGestureDetector->onTouchEvent(event);
     LOGD_IF(_DEBUG,"intercept: x:%.f ,y:%.f",event.getX(),event.getY());
     const int action = event.getActionMasked();
     if (action == MotionEvent::ACTION_DOWN) {
@@ -69,7 +70,7 @@ bool ItemTouchHelper::onInterceptTouchEvent(RecyclerView& recyclerView,MotionEve
 }
 
 void ItemTouchHelper::onTouchEvent(RecyclerView& recyclerView,MotionEvent& event) {
-    //mGestureDetector.onTouchEvent(event);
+    mGestureDetector->onTouchEvent(event);
     LOGD_IF(_DEBUG,"on touch: x:%d,y:%d",mInitialTouchX,mInitialTouchY);
     if (mVelocityTracker != nullptr) {
         mVelocityTracker->addMovement(event);
@@ -179,19 +180,18 @@ void ItemTouchHelper::destroyCallbacks() {
 }
 
 void ItemTouchHelper::startGestureDetection() {
-    /*mItemTouchHelperGestureListener = new ItemTouchHelperGestureListener();
-    mGestureDetector = new GestureDetectorCompat(mRecyclerView->getContext(),
-            mItemTouchHelperGestureListener);*/
+    mItemTouchHelperGestureListener.onDown=std::bind(&ItemTouchHelper::onGestureDown,this,std::placeholders::_1);
+    mItemTouchHelperGestureListener.onLongPress=std::bind(&ItemTouchHelper::onGestureLongPress,this,std::placeholders::_1);
+    mGestureDetector = new GestureDetector(mRecyclerView->getContext(),mItemTouchHelperGestureListener);
 }
 
 void ItemTouchHelper::stopGestureDetection() {
-    /*if (mItemTouchHelperGestureListener != null) {
-        mItemTouchHelperGestureListener.doNotReactToLongPress();
-        mItemTouchHelperGestureListener = null;
+    if (mItemTouchHelperGestureListener.onDown||mItemTouchHelperGestureListener.onLongPress) {
+        doNotReactToLongPress();
+        mItemTouchHelperGestureListener ={};
     }
-    if (mGestureDetector != null) {
-        mGestureDetector = null;
-    }*/
+    delete mGestureDetector;
+    mGestureDetector = nullptr;
 }
 
 void ItemTouchHelper::getSelectedDxDy(float outPosition[2]) {
@@ -1222,42 +1222,39 @@ int ItemTouchHelper::SimpleCallback::getMovementFlags(RecyclerView& recyclerView
             getSwipeDirs(recyclerView, viewHolder));
 }
 
-ItemTouchHelper::ItemTouchHelperGestureListener::ItemTouchHelperGestureListener(ItemTouchHelper*hlp):mItemTouchHelper(hlp) {
-}
-
-void ItemTouchHelper::ItemTouchHelperGestureListener::doNotReactToLongPress() {
+void ItemTouchHelper::doNotReactToLongPress() {
     mShouldReactToLongPress = false;
 }
 
-bool ItemTouchHelper::ItemTouchHelperGestureListener::onDown(MotionEvent& e) {
+bool ItemTouchHelper::onGestureDown(MotionEvent& e) {
     return true;
 }
 
-void ItemTouchHelper::ItemTouchHelperGestureListener::onLongPress(MotionEvent& e) {
+void ItemTouchHelper::onGestureLongPress(MotionEvent& e) {
     if (!mShouldReactToLongPress) {
         return;
     }
-    View* child = mItemTouchHelper->findChildView(e);
+    View* child = findChildView(e);
     if (child != nullptr) {
-        RecyclerView::ViewHolder* vh = mItemTouchHelper->mRecyclerView->getChildViewHolder(child);
+        RecyclerView::ViewHolder* vh = mRecyclerView->getChildViewHolder(child);
         if (vh != nullptr) {
-            if (!mItemTouchHelper->mCallback->hasDragFlag(*mItemTouchHelper->mRecyclerView,*vh)) {
+            if (!mCallback->hasDragFlag(*mRecyclerView,*vh)) {
                 return;
             }
             int pointerId = e.getPointerId(0);
             // Long press is deferred.
             // Check w/ active pointer id to avoid selecting after motion
             // event is canceled.
-            if (pointerId == mItemTouchHelper->mActivePointerId) {
-                const int index = e.findPointerIndex(mItemTouchHelper->mActivePointerId);
+            if (pointerId == mActivePointerId) {
+                const int index = e.findPointerIndex(mActivePointerId);
                 const float x = e.getX(index);
                 const float y = e.getY(index);
-                mItemTouchHelper->mInitialTouchX = x;
-                mItemTouchHelper->mInitialTouchY = y;
-                mItemTouchHelper->mDx = mItemTouchHelper->mDy = 0.f;
+                mInitialTouchX = x;
+                mInitialTouchY = y;
+                mDx = mDy = 0.f;
                 LOGD_IF(_DEBUG,"onlong press: x:%.f ,y:%.f",x,y);
-                if (mItemTouchHelper->mCallback->isLongPressDragEnabled()) {
-                    mItemTouchHelper->select(vh, ACTION_STATE_DRAG);
+                if (mCallback->isLongPressDragEnabled()) {
+                    select(vh, ACTION_STATE_DRAG);
                 }
             }
         }
diff --git a/src/gui/widgetEx/recyclerview/itemtouchhelper.h b/src/gui/widgetEx/recyclerview/itemtouchhelper.h
index 0e4bc57c..a531e92a 100755
--- a/src/gui/widgetEx/recyclerview/itemtouchhelper.h
+++ b/src/gui/widgetEx/recyclerview/itemtouchhelper.h
@@ -35,9 +35,7 @@ public:
     class Callback;
     class SimpleCallback;
     class RecoverAnimation;
-    class ItemTouchHelperGestureListener;
 protected:
-    friend ItemTouchHelperGestureListener;
     std::vector<View*> mPendingCleanup;
     std::vector<RecoverAnimation*> mRecoverAnimations;
     RecyclerView* mRecyclerView;
@@ -68,6 +66,11 @@ private:
     int mOverdrawChildPosition = -1;
     GestureDetector* mGestureDetector;
     //ItemTouchHelperGestureListener mItemTouchHelperGestureListener;
+    GestureDetector::OnGestureListener mItemTouchHelperGestureListener;
+    bool mShouldReactToLongPress = true;
+    void doNotReactToLongPress();
+    bool onGestureDown(MotionEvent& e);
+    void onGestureLongPress(MotionEvent& e);
 
     RecyclerView::OnItemTouchListener mOnItemTouchListener;
     RecyclerView::OnChildAttachStateChangeListener mOnChildAttachStateChangeListener;
@@ -189,17 +192,6 @@ public:
     int getMovementFlags(RecyclerView& recyclerView,RecyclerView::ViewHolder& viewHolder)override;
 };
 
-class ItemTouchHelper::ItemTouchHelperGestureListener/*:public GestureDetector::SimpleOnGestureListener*/{
-private:
-    bool mShouldReactToLongPress = true;
-    ItemTouchHelper*mItemTouchHelper;
-public:
-    ItemTouchHelperGestureListener(ItemTouchHelper*);
-    void doNotReactToLongPress();
-    bool onDown(MotionEvent& e);
-    void onLongPress(MotionEvent& e);
-};
-
 class ItemTouchHelper::RecoverAnimation{
 protected:
     friend ItemTouchHelper;