ADHOC
/
replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

DO NOT MERGE: Make sure signature is added to reply/forward 

* Add this to processSourceMessage in the reply/forward cases
* Add unit tests for reply and forward case

Backport of I6be8383fe5f217a4bda8e669cb69f439bc8e96b6

Bug: 2734321
Change-Id: Ia59e8c4e2f9663f2a10cff066eddeff80bc06cef
This commit is contained in:
Marc Blank 2010-07-04 18:17:54 -07:00
parent ff0712cb1e
commit 6512458784
2 changed files with 54 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1507,10 +1507,12 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
mSubjectView.setText(subject);
}
displayQuotedText(message.mText, message.mHtml);
setInitialComposeText(null, (account != null) ? account.mSignature : null);
} else if (ACTION_FORWARD.equals(mAction)) {
mSubjectView.setText(subject != null && !subject.toLowerCase().startsWith("fwd:") ?
"Fwd: " + subject : subject);
displayQuotedText(message.mText, message.mHtml);
setInitialComposeText(null, (account != null) ? account.mSignature : null);
// TODO: re-enable loadAttachments below
// if (!loadAttachments(message, 0)) {
// mHandler.sendEmptyMessage(MSG_SKIPPED_ATTACHMENTS);

56
tests/src/com/android/email/activity/MessageComposeInstrumentationTests.java → tests/src/com/android/email/activity/MessageComposeTests.java
View File

@ -40,9 +40,12 @@ import android.widget.MultiAutoCompleteTextView;
* Various instrumentation tests for MessageCompose.
*
* It might be possible to convert these to ActivityUnitTest, which would be faster.
*
* You can run this entire test case with:
* runtest -c com.android.email.activity.MessageComposeTests email
*/
@LargeTest
public class MessageComposeInstrumentationTests
public class MessageComposeTests
extends ActivityInstrumentationTestCase2<MessageCompose> {
private MultiAutoCompleteTextView mToView;
@ -104,7 +107,7 @@ public class MessageComposeInstrumentationTests
private static final String ACTION_FORWARD = "com.android.email.intent.action.FORWARD";
private static final String ACTION_EDIT_DRAFT = "com.android.email.intent.action.EDIT_DRAFT";
public MessageComposeInstrumentationTests() {
public MessageComposeTests() {
super(MessageCompose.class);
}
@ -177,7 +180,6 @@ public class MessageComposeInstrumentationTests
* TODO test REPLY_ALL
*/
public void testProcessSourceMessageReply() throws MessagingException, Throwable {
final Message message = buildTestMessage(RECIPIENT_TO, SENDER, SUBJECT, BODY);
Intent intent = new Intent(ACTION_REPLY);
final MessageCompose a = getActivity();
@ -204,6 +206,51 @@ public class MessageComposeInstrumentationTests
});
}
public void testProcessSourceMessageReplyWithSignature() throws MessagingException, Throwable {
final Message message = buildTestMessage(RECIPIENT_TO, SENDER, SUBJECT, BODY);
Intent intent = new Intent(ACTION_REPLY);
final MessageCompose a = getActivity();
a.setIntent(intent);
final Account account = new Account();
account.mSignature = SIGNATURE;
runTestOnUiThread(new Runnable() {
public void run() {
a.processSourceMessage(message, account);
checkFields(SENDER + ", ", null, null, "Re: " + SUBJECT, null, SIGNATURE);
checkFocused(mMessageView);
}
});
message.mFrom = null;
message.mReplyTo = Address.parseAndPack(REPLYTO);
runTestOnUiThread(new Runnable() {
public void run() {
resetViews();
a.processSourceMessage(message, account);
checkFields(REPLYTO + ", ", null, null, "Re: " + SUBJECT, null, SIGNATURE);
checkFocused(mMessageView);
}
});
}
public void testProcessSourceMessageForwardWithSignature()
throws MessagingException, Throwable {
final Message message = buildTestMessage(RECIPIENT_TO, SENDER, SUBJECT, BODY);
Intent intent = new Intent(ACTION_FORWARD);
final MessageCompose a = getActivity();
a.setIntent(intent);
final Account account = new Account();
account.mSignature = SIGNATURE;
runTestOnUiThread(new Runnable() {
public void run() {
a.processSourceMessage(message, account);
checkFields(null, null, null, "Fwd: " + SUBJECT, null, SIGNATURE);
checkFocused(mToView);
}
});
}
/**
* Test reply to utf-16 name and address
*/
@ -692,9 +739,10 @@ public class MessageComposeInstrumentationTests
}
String contentText = mMessageView.getText().toString();
if (content == null) {
if (content == null && signature == null) {
assertEquals(0, contentText.length());
} else {
if (content == null) content = "";
if (signature != null) {
int textLength = content.length();
if (textLength == 0 || content.charAt(textLength - 1) != '\n') {