moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-17 21:32:26 -05:00
Code Issues Releases Wiki Activity

Change when <html> tags are applied to messages.

Browse Source 
Previously, <html>, <head>, & <body> tags were
attached to messages before they were stored locally.
But now that the <head> element also needs to include
a <meta> element (for proper MessageWebView display),
it seems unecesary to store all these tags with each
message.

Now the tags are no longer stored with the messages.  Instead,
MessageWebView applies the tags before displaying the message.

This also eliminates the need to upgrade an older
message database where all the old messages would have
otherwise needed to be wrapped with the new tags.
This commit is contained in:
Joe Steele 2013-03-01 12:59:59 -05:00
parent 731022339d
commit e2c5229e85
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/fsck/k9/activity/MessageCompose.java
View File

@ -3047,7 +3047,7 @@ public class MessageCompose extends K9Activity implements OnClickListener {
if (part != null) { if (part != null) {
if (K9.DEBUG) if (K9.DEBUG)
Log.d(K9.LOG_TAG, "getBodyTextFromMessage: HTML requested, text found."); Log.d(K9.LOG_TAG, "getBodyTextFromMessage: HTML requested, text found.");
return HtmlConverter.textToHtml(MimeUtility.getTextFromPart(part), true); return HtmlConverter.textToHtml(MimeUtility.getTextFromPart(part), false);
} }
} else if (format == SimpleMessageFormat.TEXT) { } else if (format == SimpleMessageFormat.TEXT) {
// Text takes precedence, then html. // Text takes precedence, then html.

3
src/com/fsck/k9/mail/internet/MimeUtility.java
View File

@ -1376,7 +1376,6 @@ public class MimeUtility {
StringBuilder text = new StringBuilder(); StringBuilder text = new StringBuilder();
StringBuilder html = new StringBuilder(); StringBuilder html = new StringBuilder();
html.append(HtmlConverter.getHtmlHeader());
for (Viewable viewable : viewables) { for (Viewable viewable : viewables) {
if (viewable instanceof Textual) { if (viewable instanceof Textual) {
@ -1428,8 +1427,6 @@ public class MimeUtility {
} }
} }
html.append(HtmlConverter.getHtmlFooter());
return new ViewableContainer(text.toString(), html.toString(), attachments); return new ViewableContainer(text.toString(), html.toString(), attachments);
} catch (Exception e) { } catch (Exception e) {
throw new MessagingException("Couldn't extract viewable parts", e); throw new MessagingException("Couldn't extract viewable parts", e);

11
src/com/fsck/k9/view/MessageWebView.java
View File

@ -152,15 +152,14 @@ public class MessageWebView extends TitleBarWebView {
} }
public void setText(String text, String contentType) { public void setText(String text, String contentType) {
String content = text; String content = "<html><head><meta name=\"viewport\" content=\"width=device-width\"/>";
if (K9.getK9MessageViewTheme() == K9.Theme.DARK) { if (K9.getK9MessageViewTheme() == K9.Theme.DARK) {
// It's a little wrong to just throw in the <style> before the opening <html> content += "<style type=\"text/css\">" +
// but it's less wrong than trying to edit the html stream "* { background: black ! important; color: white !important }" +
content = "<style>* { background: black ! important; color: white !important }" +
":link, :link * { color: #CCFF33 !important }" + ":link, :link * { color: #CCFF33 !important }" +
":visited, :visited * { color: #551A8B !important }</style> " ":visited, :visited * { color: #551A8B !important }</style> ";
+ content;
} }
content += "</head><body>" + text + "</body></html>";
loadDataWithBaseURL("http://", content, contentType, "utf-8", null); loadDataWithBaseURL("http://", content, contentType, "utf-8", null);
} }

2
src/com/fsck/k9/view/SingleMessageView.java
View File

@ -551,7 +551,7 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
if (pgpData != null) { if (pgpData != null) {
text = pgpData.getDecryptedData(); text = pgpData.getDecryptedData();
if (text != null) { if (text != null) {
text = HtmlConverter.textToHtml(text, true); text = HtmlConverter.textToHtml(text, false);
} }
} }