#9: avoid starting a long-press timer if touch does not start on a Cl…

…ickableSpan
saket · Feb 18, 2018 · 068976d · 068976d
1 parent a1bf651
commit 068976d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...movement-method/src/main/java/me/saket/bettermovementmethod/BetterLinkMovementMethod.java b/...movement-method/src/main/java/me/saket/bettermovementmethod/BetterLinkMovementMethod.java
@@ -214,6 +214,9 @@ public boolean onTouchEvent(final TextView textView, Spannable text, MotionEvent
     }
 
     final ClickableSpan clickableSpanUnderTouch = findClickableSpanUnderTouch(textView, text, event);
+    if (event.getAction() == MotionEvent.ACTION_DOWN) {
+      clickableSpanUnderTouchOnActionDown = clickableSpanUnderTouch;
+    }
     final boolean touchStartedOverALink = clickableSpanUnderTouchOnActionDown != null;
 
     switch (event.getAction()) {
@@ -234,8 +237,6 @@ public void onTimerReached() {
           };
           startTimerForRegisteringLongClick(textView, longClickListener);
         }
-
-        clickableSpanUnderTouchOnActionDown = clickableSpanUnderTouch;
         return touchStartedOverALink;
 
       case MotionEvent.ACTION_UP:
@@ -278,6 +279,7 @@ public void onTimerReached() {
 
   private void cleanupOnTouchUp(TextView textView) {
     wasLongPressRegistered = false;
+    clickableSpanUnderTouchOnActionDown = null;
     removeUrlHighlightColor(textView);
     removeLongPressCallback(textView);
   }