Ignore link click during multiselect

app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt

@@ -785,6 +785,14 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
         }
     }
 
+    override fun onLinkClicked(vh: TaskViewHolder, url: String) =
+        if (isActionModeActive) {
+            recyclerAdapter?.toggle(vh)
+            true
+        } else {
+            false
+        }
+
     override fun onClick(taskViewHolder: TaskViewHolder) {
         if (isActionModeActive) {
             recyclerAdapter?.toggle(taskViewHolder)

app/src/main/java/org/tasks/dialogs/Linkify.kt

@@ -10,6 +10,7 @@ import android.text.style.URLSpan
 import android.text.util.Linkify
 import android.view.View
 import android.widget.TextView
+import androidx.core.net.toUri
 import androidx.core.text.util.LinkifyCompat
 import dagger.hilt.android.qualifiers.ActivityContext
 import org.tasks.R
@@ -30,10 +31,14 @@ class Linkify @Inject constructor(
         setMovementMethod(tv)
     }
 
-    fun setMovementMethod(tv: TextView, handle: (() -> Unit)? = null) {
+    fun setMovementMethod(
+        tv: TextView,
+        linkClickHandler: ((url: String) -> Boolean) = { false },
+        rowClickHandler: (() -> Unit) = {}
+    ) {
         tv.setOnClickListener {
             if (!tv.hasSelection()) {
-                handle?.invoke()
+                rowClickHandler()
             }
         }
         val text = tv.text
@@ -45,7 +50,7 @@ class Linkify @Inject constructor(
                 val end = spannable.getSpanEnd(span)
                 spannable.removeSpan(span)
                 spannable.setSpan(
-                    ClickHandlingURLSpan(span.url, handle),
+                    ClickHandlingURLSpan(span.url, linkClickHandler, rowClickHandler),
                     start,
                     end,
                     0
@@ -57,48 +62,39 @@ class Linkify @Inject constructor(
 
     private inner class ClickHandlingURLSpan constructor(
         url: String?,
-        private val onEdit: (() -> Unit)? = null
+        private val linkClickHandler: ((String) -> Boolean),
+        private val rowClickHandler: (() -> Unit),
     ) : URLSpan(url) {
         override fun onClick(widget: View) {
-            var title: String?
-            val edit = context.getString(R.string.TAd_actionEditTask)
-            val action: String
-            val uri = Uri.parse(url).let {
-                if (it.scheme.isNullOrBlank()) {
-                    Uri.parse("https://$url")
-                } else {
-                    it
-                }
+            if (linkClickHandler(url)) {
+                return
             }
-            when (uri.scheme) {
-                "tel" -> {
-                    title = uri.encodedSchemeSpecificPart
-                    action = context.getString(R.string.action_call)
-                }
-                "mailto" -> {
-                    title = uri.encodedSchemeSpecificPart
-                    action = context.getString(R.string.action_open)
-                }
+            val uri = url.toUri().takeUnless { it.scheme.isNullOrBlank() } ?: "https://$url".toUri()
+            val title = when (uri.scheme) {
+                "tel", "mailto" -> uri.encodedSchemeSpecificPart
                 "geo" -> {
-                    title = uri.encodedQuery!!.replaceFirst("q=".toRegex(), "")
-                    try {
-                        title = URLDecoder.decode(title, "utf-8")
-                    } catch (ignored: UnsupportedEncodingException) {
-                    }
-                    action = context.getString(R.string.action_open)
-                }
-                else -> {
-                    title = url
-                    action = context.getString(R.string.action_open)
+                    uri
+                        .encodedQuery
+                        ?.replaceFirst("q=".toRegex(), "")
+                        ?.let {
+                            try {
+                                URLDecoder.decode(it, "utf-8")
+                            } catch (ignored: UnsupportedEncodingException) {
+                                it
+                            }
+                        }
                 }
+                else -> url
             }
             dialogBuilder
                 .newDialog(title)
-                .setItems(listOf(action, edit)) { _, selected ->
+                .setItems(
+                    listOf(uri.action, R.string.TAd_actionEditTask).map { context.getString(it) }
+                ) { _, selected ->
                     if (selected == 0) {
                         context.startActivity(Intent(Intent.ACTION_VIEW, uri))
                     } else {
-                        onEdit?.invoke()
+                        rowClickHandler()
                     }
                 }
                 .show()
@@ -113,5 +109,8 @@ class Linkify @Inject constructor(
                 Timber.e(e)
             }
         }
+
+        val Uri.action: Int
+            get() = if (scheme == "tel") R.string.action_call else R.string.action_open
     }
 }

app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt

@@ -52,8 +52,8 @@ class TaskViewHolder internal constructor(
         setOnClickListener { changeDueDate() }
     }
     private val rowBody: ViewGroup = binding.rowBody.apply {
-        setOnClickListener { onRowBodyClick() }
-        setOnLongClickListener { onRowBodyLongClick() }
+        setOnClickListener { callback.onClick(this@TaskViewHolder) }
+        setOnLongClickListener { callback.onLongPress(this@TaskViewHolder) }
     }
     private val nameView: TextView = binding.title
     private val description: TextView = binding.description
@@ -139,14 +139,22 @@ class TaskViewHolder internal constructor(
             description.visibility = if (task.hasNotes()) View.VISIBLE else View.GONE
         }
         if (markdown.enabled || preferences.getBoolean(R.string.p_linkify_task_list, false)) {
-            linkify.setMovementMethod(nameView) { onRowBodyClick() }
-            linkify.setMovementMethod(description) { onRowBodyClick() }
+            linkify.setMovementMethod(
+                nameView,
+                linkClickHandler = { url -> callback.onLinkClicked(this, url) },
+                rowClickHandler = { callback.onClick(this) }
+            )
+            linkify.setMovementMethod(
+                description,
+                linkClickHandler = { url -> callback.onLinkClicked(this, url) },
+                rowClickHandler = { callback.onClick(this) }
+            )
             if (!markdown.enabled) {
                 Linkify.safeLinkify(nameView)
                 Linkify.safeLinkify(description)
             }
-            nameView.setOnLongClickListener { onRowBodyLongClick() }
-            description.setOnLongClickListener { onRowBodyLongClick() }
+            nameView.setOnLongClickListener { callback.onLongPress(this) }
+            description.setOnLongClickListener { callback.onLongPress(this) }
         }
         when {
             chipGroup.visibility == View.VISIBLE -> {
@@ -223,10 +231,6 @@ class TaskViewHolder internal constructor(
         }
     }
 
-    private fun onRowBodyClick() = callback.onClick(this)
-
-    private fun onRowBodyLongClick(): Boolean = callback.onLongPress(this)
-
     private fun onCompleteBoxClick() {
         val newState = completeBox.isChecked
         if (newState != task.isCompleted) {
@@ -243,6 +247,7 @@ class TaskViewHolder internal constructor(
 
     interface ViewHolderCallbacks {
         fun onCompletedTask(task: TaskContainer, newState: Boolean)
+        fun onLinkClicked(vh: TaskViewHolder, url: String): Boolean
         fun onClick(taskViewHolder: TaskViewHolder)
         fun onClick(filter: Filter)
         fun toggleSubtasks(task: TaskContainer, collapsed: Boolean)