moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2025-01-11 13:49:15 -05:00
Code Issues Releases Wiki Activity

restore linkifies HTTP URLs in plaintext mail messages

Browse Source
This commit is contained in:
Jesse Vincent 2008-11-03 06:36:53 +00:00
parent be49a0c707
commit 43adde216c
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/com/fsck/k9/activity/MessageView.java
View File

@ -301,7 +301,7 @@ public class MessageView extends Activity
// UrlInterceptRegistry.registerHandler(this); // UrlInterceptRegistry.registerHandler(this);
mMessageContentView.getSettings().setBlockNetworkImage(true); mMessageContentView.getSettings().setBlockNetworkImage(true);
mMessageContentView.getSettings().setSupportZoom(false); mMessageContentView.getSettings().setSupportZoom(true);
setTitle(""); setTitle("");
@ -736,12 +736,29 @@ public class MessageView extends Activity
if (part.getMimeType().equalsIgnoreCase("text/html")) { if (part.getMimeType().equalsIgnoreCase("text/html")) {
text = text.replaceAll("cid:", "http://cid/"); text = text.replaceAll("cid:", "http://cid/");
} else { } else {
/* Matcher m = Regex.WEB_URL_PATTERN.matcher(text);
StringBuffer sb = new StringBuffer();
while (m.find()) {
int start = m.start();
if (start != 0 && text.charAt(start - 1) != '@') {
m.appendReplacement(sb, "<a href=\"$0\">$0</a>");
}
else {
m.appendReplacement(sb, "$0");
}
}
m.appendTail(sb);
/*
* Convert plain text to HTML by replacing * Convert plain text to HTML by replacing
* \r?\n with <br> and adding a html/body wrapper. * \r?\n with <br> and adding a html/body wrapper.
*/ */
text = text.replaceAll("\r?\n", "<br>"); text = sb.toString().replaceAll("\r?\n", "<br>");
text = "<html><body>" + text + "</body></html>"; text = "<html><body>" + text + "</body></html>";
} }
@ -755,7 +772,6 @@ public class MessageView extends Activity
} }
markup = new SpannableString(text); markup = new SpannableString(text);
Linkify.addLinks(markup, Linkify.ALL); Linkify.addLinks(markup, Linkify.ALL);
mMessageContentView.loadDataWithBaseURL("email://", markup.toString(), "text/html", mMessageContentView.loadDataWithBaseURL("email://", markup.toString(), "text/html",
"utf-8", null); "utf-8", null);
} }