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 issue 419

Browse Source 
. Moved signature to the bottom of the message body view so that it is not editable
TODO: Add signature location preference / settings
This commit is contained in:
Bao-Long Nguyen-Trong 2009-05-14 00:03:19 +00:00
parent 182bc74755
commit 536133daf1
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -480,6 +480,13 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
mMessageContentView.requestFocus();
}
if (!ACTION_EDIT_DRAFT.equals(action)) {
String signature = getSignature();
if (signature!=null) {
mMessageContentView.setText(signature);
}
}
addAddress(mBccView, new Address(mAccount.getAlwaysBcc(), ""));
updateTitle();
}
@ -597,12 +604,9 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
*/
String text = mMessageContentView.getText().toString();
if (!this.mSourceMessageProcessed) {
text = appendSignature(text);
}
if (mQuotedTextBar.getVisibility() == View.VISIBLE) {
String action = getIntent().getAction();
if (mQuotedTextBar.getVisibility() == View.VISIBLE) {
String quotedText = null;
Part part = MimeUtility.findFirstPartByMimeType(mSourceMessage,
"text/plain");
@ -632,6 +636,17 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
}
}
/*
* Place holder for when we implement the signature location preference / setting
*
if (!ACTION_EDIT_DRAFT.equals(action)) {
String signature = getSignature();
if (signature!=null) {
text += signature;
}
}
*/
TextBody body = new TextBody(text);
if (mAttachments.getChildCount() > 0) {
@ -672,15 +687,16 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
return message;
}
private String appendSignature (String text) {
private String getSignature() {
String mSignature;
mSignature = mAccount.getSignature();
if (mSignature != null && ! mSignature.contentEquals("")){
text += "\n-- \n" + mAccount.getSignature();
if (mSignature != null && !mSignature.contentEquals("")) {
return "\n--\n" + mAccount.getSignature();
}
else {
return null;
}
return text;
}