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

Fix bug with advancing the position when linkifying failed

Browse source
This commit is contained in:
cketti 2017-03-17 15:19:16 +01:00
parent 0f9bc4867a
commit 98974a7699
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
k9mail/src/main/java/com/fsck/k9/message/html/UriLinkifier.java
View file

@ -51,7 +51,7 @@ public class UriLinkifier {
boolean uriWasNotLinkified = newPos <= startPos; boolean uriWasNotLinkified = newPos <= startPos;
if (uriWasNotLinkified) { if (uriWasNotLinkified) {
outputBuffer.append(text.charAt(startPos)); outputBuffer.append(text.charAt(startPos));
currentPos++; currentPos = startPos + 1;
} else { } else {
currentPos = (newPos > currentPos) ? newPos : currentPos + 1; currentPos = (newPos > currentPos) ? newPos : currentPos + 1;
} }

9
k9mail/src/test/java/com/fsck/k9/message/html/UriLinkifierTest.java
View file

@ -115,4 +115,13 @@ public class UriLinkifierTest {
assertEquals("myhttp: <a href=\"http://example.org\">http://example.org</a>", outputBuffer.toString()); assertEquals("myhttp: <a href=\"http://example.org\">http://example.org</a>", outputBuffer.toString());
} }
@Test
public void schemaMatchWithInvalidUriInMiddleOfTextFollowedVyValidUri() throws Exception {
String text = "prefix http:42 http://example.org";
UriLinkifier.linkifyText(text, outputBuffer);
assertEquals("prefix http:42 <a href=\"http://example.org\">http://example.org</a>", outputBuffer.toString());
}
} }