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

Commit 13bc4ad1 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 24902 into eclair 

* changes:
  Add "rtsp" to the list of URL schemes that get linkified.
parents 1fa72447 7a4be89f

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

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ public class Linkify { 


        if ((mask & WEB_URLS) != 0) {

            gatherLinks(links, text, Regex.WEB_URL_PATTERN,

                new String[] { "http://", "https://" },

                new String[] { "http://", "https://", "rtsp://" },

                sUrlMatchFilter, null);

        }

core/java/android/text/util/Regex.java

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public class Regex { 
     */

    public static final Pattern WEB_URL_PATTERN

        = Pattern.compile(

            "((?:(http|https|Http|Https):\\/\\/(?:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\'\\(\\)"

            "((?:(http|https|Http|Https|rtsp|Rtsp):\\/\\/(?:(?:[a-zA-Z0-9\\$\\-\\_\\.\\+\\!\\*\\'\\(\\)"

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

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

            + "((?:(?:[a-zA-Z0-9][a-zA-Z0-9\\-]{0,64}\\.)+"   // named host