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

Commit 013515e6 authored by Tony Mak's avatar Tony Mak Committed by Tim Schumacher
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
(cherry picked from commit 73f398d3)
parent 7f5fb5d6

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

+36 −0
Original line number Diff line number Diff line
@@ -23,6 +23,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;
@@ -58,6 +59,9 @@ import com.android.i18n.phonenumbers.PhoneNumberUtil.Leniency; 
 */



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
@@ -202,6 +206,11 @@ public class Linkify { 
     *  repeatedly on the same text.

     */

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

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

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

            return false;

        }



        if (mask == 0) {

            return false;

        }
@@ -247,6 +256,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
@@ -344,6 +376,10 @@ public class Linkify { 
     *                      a scheme specified in the link text

     */

    public static final boolean addLinks(Spannable text, Pattern pattern, String scheme) {

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

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

            return false;

        }

        return addLinks(text, pattern, scheme, null, null);

    }