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

Fixed restoring drafts saved with "reply after quoted text" enabled

Browse Source 
Fixes issue 2568
This commit is contained in:
Sven-Hendrik Haase 2011-10-27 07:23:01 +02:00 committed by cketti
parent b6cdec43e9
commit f4f726ae67
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2189,14 +2189,22 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
Part textPart = MimeUtility.findFirstPartByMimeType(message, "text/plain"); Part textPart = MimeUtility.findFirstPartByMimeType(message, "text/plain");
if (textPart != null) { if (textPart != null) {
String text = MimeUtility.getTextFromPart(textPart); String text = MimeUtility.getTextFromPart(textPart);
if (K9.DEBUG) {
Log.d(K9.LOG_TAG, "Loading message with offset " + bodyOffset + ", length " + bodyLength + ". Text length is " + text.length() + ".");
}
// 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 != null && bodyLength + 1 < text.length()) { // + 1 to get rid of the newline we added when saving the draft if (bodyLength != null && bodyLength + 1 < text.length()) { // + 1 to get rid of the newline we added when saving the draft
String bodyText = text.substring(0, bodyLength); String bodyText = text.substring(bodyOffset, bodyOffset + bodyLength);
String quotedText = text.substring(bodyLength + 1, text.length());
// Regenerate the quoted text without our user content in it.
StringBuilder quotedText = new StringBuilder();
quotedText.append(text.substring(0, bodyOffset)); // stuff before the reply
quotedText.append(text.substring(bodyOffset + bodyLength));
mMessageContentView.setText(bodyText); mMessageContentView.setText(bodyText);
mQuotedText.setText(quotedText); mQuotedText.setText(quotedText.toString());
} else { } else {
mMessageContentView.setText(text); mMessageContentView.setText(text);
} }