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

Rename mDraft to mInsertSeparator.

Browse Source
This commit is contained in:
Koji Arai 2014-05-02 08:36:46 +09:00
parent a08687b70e
commit 56a48476e4
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1368,13 +1368,9 @@ public class MessageCompose extends K9Activity implements OnClickListener,
boolean includeQuotedText = (isDraft || mQuotedTextMode == QuotedTextMode.SHOW); boolean includeQuotedText = (isDraft || mQuotedTextMode == QuotedTextMode.SHOW);
textBodyBuilder.setIncludeQuotedText(includeQuotedText); textBodyBuilder.setIncludeQuotedText(includeQuotedText);
if (!isDraft) { textBodyBuilder.setAppendSignature(!isDraft);
textBodyBuilder.setAppendSignature(true); textBodyBuilder.setInsertSeparator(!isDraft);
}
else {
textBodyBuilder.setAppendSignature(false);
}
textBodyBuilder.setDraft(isDraft);
textBodyBuilder.setSignatureBeforeQuotedText(mAccount.isSignatureBeforeQuotedText()); textBodyBuilder.setSignatureBeforeQuotedText(mAccount.isSignatureBeforeQuotedText());
if (mQuoteStyle == QuoteStyle.PREFIX && mAccount.isReplyAfterQuote()) { if (mQuoteStyle == QuoteStyle.PREFIX && mAccount.isReplyAfterQuote()) {

15
src/com/fsck/k9/mail/internet/TextBodyBuilder.java
View File

@ -13,7 +13,8 @@ public class TextBodyBuilder {
private boolean mIncludeQuotedText = true; private boolean mIncludeQuotedText = true;
private boolean mReplyAfterQuote = false; private boolean mReplyAfterQuote = false;
private boolean mSignatureBeforeQuotedText = false; private boolean mSignatureBeforeQuotedText = false;
private boolean mDraft = false;
private boolean mInsertSeparator = false;
private boolean mAppendSignature = true; private boolean mAppendSignature = true;
// message parts // message parts
@ -77,14 +78,14 @@ public class TextBodyBuilder {
if (mReplyAfterQuote) { if (mReplyAfterQuote) {
quotedHtmlContent.setInsertionLocation( quotedHtmlContent.setInsertionLocation(
InsertableHtmlContent.InsertionLocation.AFTER_QUOTE); InsertableHtmlContent.InsertionLocation.AFTER_QUOTE);
if (!mDraft) { if (mInsertSeparator) {
text = "<br clear=\"all\">" + text; text = "<br clear=\"all\">" + text;
} }
} }
else { else {
quotedHtmlContent.setInsertionLocation( quotedHtmlContent.setInsertionLocation(
InsertableHtmlContent.InsertionLocation.BEFORE_QUOTE); InsertableHtmlContent.InsertionLocation.BEFORE_QUOTE);
if (!mDraft) { if (mInsertSeparator) {
text += "<br><br>"; text += "<br><br>";
} }
} }
@ -227,12 +228,12 @@ public class TextBodyBuilder {
mIncludeQuotedText = includeQuotedText; mIncludeQuotedText = includeQuotedText;
} }
public boolean isDraft() { public boolean isInsertSeparator() {
return mDraft; return mInsertSeparator;
} }
public void setDraft(boolean draft) { public void setInsertSeparator(boolean insertSeparator) {
mDraft = draft; mInsertSeparator = insertSeparator;
} }
public boolean isSignatureBeforeQuotedText() { public boolean isSignatureBeforeQuotedText() {