return tag click event consumption

Carter Hudson · Carter Hudson · commit 2fdde109d150 · 2020-08-28T09:50:35.000-06:00
diff --git a/HtmlTextView/src/main/java/org/sufficientlysecure/htmltextview/HtmlTagHandler.java b/HtmlTextView/src/main/java/org/sufficientlysecure/htmltextview/HtmlTagHandler.java
@@ -271,10 +271,13 @@ public boolean handleTag(boolean opening, String tag, Editable output, Attribute
                     @Override
                     public void onClick(View widget) {
                         if (onClickATagListenerProvider != null) {
-                            onClickATagListenerProvider.provideTagClickListener()
-                                                       .onClick(widget, spannedText, getURL());
+                            boolean clickConsumed =
+                                onClickATagListenerProvider.provideTagClickListener()
+                                                           .onClick(widget, spannedText, getURL());
+                            if (!clickConsumed) {
+                                super.onClick(widget);
+                            }
                         }
-                        super.onClick(widget);
                     }
                 });
             } else if (tag.equalsIgnoreCase("code")) {
diff --git a/HtmlTextView/src/main/java/org/sufficientlysecure/htmltextview/OnClickATagListener.java b/HtmlTextView/src/main/java/org/sufficientlysecure/htmltextview/OnClickATagListener.java
@@ -8,5 +8,12 @@
  * This listener can define what happens when the a tag is clicked
  */
 public interface OnClickATagListener {
-    void onClick(View widget, String spannedText, @Nullable String href);
+    /**
+     * Notifies of anchor tag click events.
+     * @param widget - the {@link HtmlTextView} instance
+     * @param spannedText - the string value of the text spanned
+     * @param href - the url for the anchor tag
+     * @return indicates whether the click event has been handled
+     */
+    boolean onClick(View widget, String spannedText, @Nullable String href);
 }
diff --git a/example/src/main/java/org/sufficientlysecure/htmltextview/example/MainActivity.java b/example/src/main/java/org/sufficientlysecure/htmltextview/example/MainActivity.java
@@ -76,10 +76,12 @@ protected void onCreate(Bundle savedInstanceState) {
         // a tag click listener
         textView.setOnClickATagListener(new OnClickATagListener() {
             @Override
-            public void onClick(View widget, String spannedText, @Nullable String href) {
+            public boolean onClick(View widget, String spannedText, @Nullable String href) {
                 final Toast toast = Toast.makeText(MainActivity.this, null, Toast.LENGTH_SHORT);
                 toast.setText(href);
                 toast.show();
+
+                return false;
             }
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -76,10 +76,12 @@ protected void onCreate(Bundle savedInstanceState) {`
`76`	`76`	`// a tag click listener`
`77`	`77`	`textView.setOnClickATagListener(new OnClickATagListener() {`
`78`	`78`	`@Override`
`79`		`- public void onClick(View widget, String spannedText, @Nullable String href) {`
	`79`	`+ public boolean onClick(View widget, String spannedText, @Nullable String href) {`
`80`	`80`	`final Toast toast = Toast.makeText(MainActivity.this, null, Toast.LENGTH_SHORT);`
`81`	`81`	`toast.setText(href);`
`82`	`82`	`toast.show();`
	`83`	`+`
	`84`	`+ return false;`
`83`	`85`	`}`
`84`	`86`	`});`
`85`	`87`	`}`