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

8
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,6 +3091,7 @@ 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.
if (bodyLength > 0) {
try { try {
String bodyText = text.substring(bodyOffset, bodyOffset + bodyLength); String bodyText = text.substring(bodyOffset, bodyOffset + bodyLength);
@ -3120,6 +3121,11 @@ public class MessageCompose extends K9Activity implements OnClickListener,
mMessageContentView.setCharacters(text); mMessageContentView.setCharacters(text);
} }
} }
} else {
if (viewMessageContent) {
mMessageContentView.setCharacters(text);
}
}
} }
} }