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

Commit eeabe4bb authored by kaiyiz's avatar kaiyiz Committed by Gerrit - the friendly Code Review server
Browse files

MMS: Fix Can't identify URL and phone number in MMS correctly 

Forbidden chinese character in url's host, and url can't start with chinese
character.

Change the regex pattern to avoid match chinese character in URL

CRs-Fixed: 619147

Change-Id: I154fe60a5d19493e3273449ef922e79876677ecb
parent b8029db8

core/java/android/util/Patterns.java

+5 −4
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public class Patterns { 
        + "(?:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\'\\(\\)"

        + "\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,64}(?:\\:(?:[a-zA-Z0-9\\$\\-\\_"

        + "\\.\\+\\!\\*\\'\\(\\)\\,\\;\\?\\&\\=]|(?:\\%[a-fA-F0-9]{2})){1,25})?\\@)?)?"

        + "((?:(?:[" + GOOD_IRI_HOST_CHAR + "][" + GOOD_IRI_CHAR + "\\-]{0,64}\\.)+"   // named host

        + "((?:(?:[" + GOOD_IRI_HOST_CHAR + "][" + GOOD_IRI_HOST_CHAR + "\\-]{0,64}\\.)+"

        + TOP_LEVEL_DOMAIN_STR_FOR_WEB_URL

        + "|(?:(?:25[0-5]|2[0-4]" // or ip address

        + "[0-9]|[0-1][0-9]{2}|[1-9][0-9]|[1-9])\\.(?:25[0-5]|2[0-4][0-9]"
@@ -132,9 +132,10 @@ public class Patterns { 
        + "[0-9]{2}|[1-9][0-9]|[1-9]|0)\\.(?:25[0-5]|2[0-4][0-9]|[0-1][0-9]{2}"

        + "|[1-9][0-9]|[0-9])))"

        + "(?:\\:\\d{1,5})?)" // plus option port number

        + "(\\/(?:(?:[" + GOOD_IRI_CHAR + "\\;\\/\\?\\:\\@\\&\\=\\#\\~"  // plus option query params

        + "\\-\\.\\+\\!\\*\\'\\(\\)\\_])|(?:\\,[" + GOOD_IRI_CHAR + "])|(?:\\%[a-fA-F0-9]{2}))*)?",

          Pattern.CASE_INSENSITIVE);

        + "(\\/(?:(?:[" + GOOD_IRI_HOST_CHAR

        + "\\;\\/\\?\\:\\@\\&\\=\\#\\~"  // plus option query params

        + "\\-\\.\\+\\!\\*\\'\\(\\)\\_])|(?:\\,[" + GOOD_IRI_HOST_CHAR

        + "])|(?:\\%[a-fA-F0-9]{2}))*)?", Pattern.CASE_INSENSITIVE);



    public static final Pattern IP_ADDRESS

        = Pattern.compile(