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

Fixed issue 191

This commit is contained in:
Bao-Long Nguyen-Trong 2009-05-10 05:39:47 +00:00
parent 97a4f97b64
commit e844f4ab0c
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/android/email/activity/MessageCompose.java
View File

@ -597,7 +597,10 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
*/ */
String text = mMessageContentView.getText().toString(); String text = mMessageContentView.getText().toString();
if (!this.mSourceMessageProcessed) {
text = appendSignature(text);
}
if (mQuotedTextBar.getVisibility() == View.VISIBLE) { if (mQuotedTextBar.getVisibility() == View.VISIBLE) {
String action = getIntent().getAction(); String action = getIntent().getAction();
String quotedText = null; String quotedText = null;
@ -629,10 +632,6 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
} }
} }
if (!mSourceMessageProcessed) {
text = appendSignature(text);
}
TextBody body = new TextBody(text); TextBody body = new TextBody(text);
if (mAttachments.getChildCount() > 0) { if (mAttachments.getChildCount() > 0) {
@ -673,12 +672,12 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
return message; return message;
} }
private String appendSignature (String text) { private String appendSignature(String text) {
String mSignature; String mSignature;
mSignature = mAccount.getSignature(); mSignature = mAccount.getSignature();
if (mSignature != null && ! mSignature.contentEquals("")){ if (mSignature != null && !mSignature.contentEquals("")) {
text += "\n-- \n" + mAccount.getSignature(); text += "\n-----\n" + mAccount.getSignature();
} }
return text; return text;