moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix the way newlines are added in HTML mode.

This commit is contained in:
Andrew Chen 2011-01-28 21:41:06 +00:00
parent 5e7982a31b
commit 13898f7edf
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -967,8 +967,6 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
mQuotedHtmlContent.clearQuotedContent();
}
mQuotedHtmlContent.setUserContent(text);
// Set the insertion location based upon our reply after quote setting. Reply after
// quote makes no sense for HEADER style replies. In addition, add some extra
// separators between the composed message and quoted message depending on the quote
@ -980,7 +978,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
mQuotedHtmlContent.setInsertionLocation(InsertableHtmlContent.InsertionLocation.AFTER_QUOTE);
if (!isDraft)
{
text = "<br><br>" + text;
text = "<br clear=\"all\">" + text;
}
}
else
@ -988,9 +986,12 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
mQuotedHtmlContent.setInsertionLocation(InsertableHtmlContent.InsertionLocation.BEFORE_QUOTE);
if (!isDraft)
{
text += "<br>";
text += "<br><br>";
}
}
mQuotedHtmlContent.setUserContent(text);
// All done. Build the body.
TextBody body = new TextBody(mQuotedHtmlContent.toString());
// Save length of the body and its offset. This is used when thawing drafts.
@ -2955,7 +2956,7 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
if (quoteStyle == QuoteStyle.PREFIX)
{
StringBuilder header = new StringBuilder(QUOTE_BUFFER_LENGTH);
header.append("<br><div class=\"gmail_quote\">");
header.append("<div class=\"gmail_quote\">");
// Remove all trailing newlines so that the quote starts immediately after the header. "Be like Gmail!"
header.append(HtmlConverter.textToHtmlFragment(String.format(
getString(R.string.message_compose_reply_header_fmt).replaceAll("\n$", ""),