Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73f398d3 authored by Tony Mak's avatar Tony Mak Committed by Abodunrinwa Toki
Browse files

RESTRICT AUTOMERGE Do not linkify text with RLO/LRO characters. 

Also don't show smart actions for selections in text with unsupported
characters.

Bug: 116321860
Test: runtest -x cts/tests/tests/text/src/android/text/util/cts/LinkifyTest.java

Change-Id: Id271cab8aef6b9b13ef17f1a8654c7616f75cf13
parent 64306e1e

core/java/android/text/util/Linkify.java

+36 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.text.style.URLSpan; 
import android.text.Spannable;

import android.text.SpannableString;

import android.text.Spanned;

import android.util.Log;

import android.util.Patterns;

import android.webkit.WebView;

import android.widget.TextView;
@@ -65,6 +66,9 @@ import libcore.util.EmptyArray; 
 */



public class Linkify {



    private static final String LOG_TAG = "Linkify";



    /**

     *  Bit field indicating that web URLs should be matched in methods that

     *  take an options mask
@@ -222,6 +226,11 @@ public class Linkify { 
     *  @return True if at least one link is found and applied.

     */

    public static final boolean addLinks(@NonNull Spannable text, @LinkifyMask int mask) {

        if (text != null && containsUnsupportedCharacters(text.toString())) {

            android.util.EventLog.writeEvent(0x534e4554, "116321860", -1, "");

            return false;

        }



        if (mask == 0) {

            return false;

        }
@@ -267,6 +276,29 @@ public class Linkify { 
        return true;

    }



    /**

     * Returns true if the specified text contains at least one unsupported character for applying

     * links. Also logs the error.

     *

     * @param text the text to apply links to

     * @hide

     */

    public static boolean containsUnsupportedCharacters(String text) {

        if (text.contains("\u202C")) {

            Log.e(LOG_TAG, "Unsupported character for applying links: u202C");

            return true;

        }

        if (text.contains("\u202D")) {

            Log.e(LOG_TAG, "Unsupported character for applying links: u202D");

            return true;

        }

        if (text.contains("\u202E")) {

            Log.e(LOG_TAG, "Unsupported character for applying links: u202E");

            return true;

        }

        return false;

    }



    /**

     *  Scans the text of the provided TextView and turns all occurrences of

     *  the link types indicated in the mask into clickable links.  If matches
@@ -414,6 +446,10 @@ public class Linkify { 
    public static final boolean addLinks(@NonNull Spannable spannable, @NonNull Pattern pattern,

            @Nullable String scheme, @Nullable MatchFilter matchFilter,

            @Nullable TransformFilter transformFilter) {

         if (spannable != null && containsUnsupportedCharacters(spannable.toString())) {

            android.util.EventLog.writeEvent(0x534e4554, "116321860", -1, "");

            return false;

        }

        return addLinks(spannable, pattern, scheme, null, matchFilter,

                transformFilter);

    }