wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix linkify issue with https: and rtsp: URIs

Browse source
This commit is contained in:
cketti 2017-04-30 02:42:07 +02:00
parent 0627ff5f87
commit b52d7c7cd8
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
k9mail/src/main/java/com/fsck/k9/message/html/HttpUriParser.java
View file

@ -30,11 +30,11 @@ class HttpUriParser implements UriParser {
// Scheme // Scheme
String shortScheme = text.substring(currentPos, Math.min(currentPos + 7, text.length())); String shortScheme = text.substring(currentPos, Math.min(currentPos + 7, text.length()));
String longScheme = text.substring(currentPos, Math.min(currentPos + 8, text.length())); String longScheme = text.substring(currentPos, Math.min(currentPos + 8, text.length()));
if (shortScheme.equalsIgnoreCase("https://")) { if (longScheme.equalsIgnoreCase("https://")) {
currentPos += "https://".length(); currentPos += "https://".length();
} else if (shortScheme.equalsIgnoreCase("http://")) { } else if (shortScheme.equalsIgnoreCase("http://")) {
currentPos += "http://".length(); currentPos += "http://".length();
} else if (longScheme.equalsIgnoreCase("rtsp://")) { } else if (shortScheme.equalsIgnoreCase("rtsp://")) {
currentPos += "rtsp://".length(); currentPos += "rtsp://".length();
} else { } else {
return startPos; return startPos;

10
k9mail/src/test/java/com/fsck/k9/message/html/HttpUriParserTest.java
View file

@ -27,6 +27,16 @@ public class HttpUriParserTest {
assertLinkify("http://www.google.com"); assertLinkify("http://www.google.com");
} }
@Test
public void simpleDomainWithHttps() {
assertLinkify("https://www.google.com");
}
@Test
public void simpleRtspUri() {
assertLinkify("rtsp://example.com/media.mp4");
}
@Test @Test
public void invalidDomainIgnored() { public void invalidDomainIgnored() {
assertLinkIgnored("http://-www.google.com"); assertLinkIgnored("http://-www.google.com");