Merge pull request #402 from wordpress-mobile/issue/396-fixing-image-click-detection

Issue/396 fixing image click detection

Author: 0nko

aztec/src/main/kotlin/org/wordpress/aztec/EnhancedMovementMethod.kt

@@ -1,7 +1,6 @@
 package org.wordpress.aztec
 
 import android.graphics.Rect
-import android.text.Selection
 import android.text.Spannable
 import android.text.method.ArrowKeyMovementMethod
 import android.text.style.ClickableSpan
@@ -29,7 +28,11 @@ object EnhancedMovementMethod : ArrowKeyMovementMethod() {
 
             val layout = widget.layout
             val line = layout.getLineForVertical(y)
-            val off = layout.getOffsetForHorizontal(line, x.toFloat())
+            var off = layout.getOffsetForHorizontal(line, x.toFloat())
+
+            if (text.length > off) {
+                off++
+            }
 
             // get the character's position. This may be the left or the right edge of the character so, find the
             //  other edge by inspecting nearby characters (if they exist)
@@ -40,18 +43,15 @@ object EnhancedMovementMethod : ArrowKeyMovementMethod() {
             val lineRect = Rect()
             layout.getLineBounds(line, lineRect)
 
-            if (((x >= charPrevX && x <= charX) || (x >= charX && x <= charNextX))
+            if (((x in charPrevX..charX) || (x in charX..charNextX))
                     && y >= lineRect.top && y <= lineRect.bottom) {
                 val link = text.getSpans(off, off, ClickableSpan::class.java).firstOrNull()
 
                 // Only react to AztecMediaClickableSpan and UnknownClickableSpan; not to regular links.
                 if (link != null && (link is AztecMediaClickableSpan || link is UnknownClickableSpan)) {
                     if (action == MotionEvent.ACTION_UP) {
                         link.onClick(widget)
-                    } else {
-                        Selection.setSelection(text, text.getSpanStart(link), text.getSpanEnd(link))
                     }
-
                     return true
                 }
             }