moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-30 13:12:25 -05:00
Code Issues Releases Wiki Activity

Don't add blank lines to composed messages if there is no quoted text

Browse Source
This commit is contained in:
Joe Steele 2013-10-08 18:30:21 -04:00
parent ef01cabccc
commit 0323af09e5
1 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1391,8 +1391,8 @@ public class MessageCompose extends K9Activity implements OnClickListener,
} }
} }
if (includeQuotedText) { String quotedText = mQuotedText.getCharacters();
String quotedText = mQuotedText.getCharacters(); if (includeQuotedText && quotedText.length() > 0) {
if (replyAfterQuote) { if (replyAfterQuote) {
composedMessageOffset = quotedText.length() + "\r\n".length(); composedMessageOffset = quotedText.length() + "\r\n".length();
text = quotedText + "\r\n" + text; text = quotedText + "\r\n" + text;
@ -3091,31 +3091,37 @@ public class MessageCompose extends K9Activity implements OnClickListener,
// If we had a body length (and it was valid), separate the composition from the quoted text // If we had a body length (and it was valid), separate the composition from the quoted text
// and put them in their respective places in the UI. // and put them in their respective places in the UI.
try { if (bodyLength > 0) {
String bodyText = text.substring(bodyOffset, bodyOffset + bodyLength); try {
String bodyText = text.substring(bodyOffset, bodyOffset + bodyLength);
// Regenerate the quoted text without our user content in it nor added newlines. // Regenerate the quoted text without our user content in it nor added newlines.
StringBuilder quotedText = new StringBuilder(); StringBuilder quotedText = new StringBuilder();
if (bodyOffset == 0 && text.substring(bodyLength, bodyLength + 4).equals("\r\n\r\n")) { if (bodyOffset == 0 && text.substring(bodyLength, bodyLength + 4).equals("\r\n\r\n")) {
// top-posting: ignore two newlines at start of quote // top-posting: ignore two newlines at start of quote
quotedText.append(text.substring(bodyLength + 4)); quotedText.append(text.substring(bodyLength + 4));
} else if (bodyOffset + bodyLength == text.length() && } else if (bodyOffset + bodyLength == text.length() &&
text.substring(bodyOffset - 2, bodyOffset).equals("\r\n")) { text.substring(bodyOffset - 2, bodyOffset).equals("\r\n")) {
// bottom-posting: ignore newline at end of quote // bottom-posting: ignore newline at end of quote
quotedText.append(text.substring(0, bodyOffset - 2)); quotedText.append(text.substring(0, bodyOffset - 2));
} else { } else {
quotedText.append(text.substring(0, bodyOffset)); // stuff before the reply quotedText.append(text.substring(0, bodyOffset)); // stuff before the reply
quotedText.append(text.substring(bodyOffset + bodyLength)); quotedText.append(text.substring(bodyOffset + bodyLength));
}
if (viewMessageContent) {
mMessageContentView.setCharacters(bodyText);
}
mQuotedText.setCharacters(quotedText);
} catch (IndexOutOfBoundsException e) {
// Invalid bodyOffset or bodyLength. The draft was edited outside of K-9 Mail?
Log.d(K9.LOG_TAG, "The identity field from the draft contains an invalid bodyOffset/bodyLength");
if (viewMessageContent) {
mMessageContentView.setCharacters(text);
}
} }
} else {
if (viewMessageContent) {
mMessageContentView.setCharacters(bodyText);
}
mQuotedText.setCharacters(quotedText);
} catch (IndexOutOfBoundsException e) {
// Invalid bodyOffset or bodyLength. The draft was edited outside of K-9 Mail?
Log.d(K9.LOG_TAG, "The identity field from the draft contains an invalid bodyOffset/bodyLength");
if (viewMessageContent) { if (viewMessageContent) {
mMessageContentView.setCharacters(text); mMessageContentView.setCharacters(text);
} }