Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I08418b82a81bc153061544ff09afb19daec9125d
This commit is contained in:
Fredrik Roubert
2020-04-01 19:21:13 +00:00
committed by Automerger Merge Worker
parent f276d0b74d cc7a0e7152
commit d13a70de57
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/text/util/Linkify.java
View File

@@ -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);
}

2
core/java/android/util/Patterns.java
View File

@@ -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|$|^)";