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

Commit cc7a0e71 authored by Fredrik Roubert's avatar Fredrik Roubert Committed by Gerrit Code Review
Browse files

Merge "Add "ftp" to the list of URL schemes that get linkified."

parents 2608950d 0b4907e8

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

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


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

            gatherLinks(links, text, Patterns.AUTOLINK_WEB_URL,

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

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

                sUrlMatchFilter, null);

        }

core/java/android/util/Patterns.java

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ public class Patterns { 
    private static final String DOMAIN_NAME_STR = "(" + HOST_NAME + "|" + IP_ADDRESS_STRING + ")";

    public static final Pattern DOMAIN_NAME = Pattern.compile(DOMAIN_NAME_STR);



    private static final String PROTOCOL = "(?i:http|https|rtsp)://";

    private static final String PROTOCOL = "(?i:http|https|rtsp|ftp)://";



    /* A word boundary or end of input.  This is to stop foo.sure from matching as foo.su */

    private static final String WORD_BOUNDARY = "(?:\\b|$|^)";