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

Fix behavior if replying to own sent message 

If the address of the account is in the reply-to: field (or from: field
when reply-to: is empty), now populates the To: field with the same To:
field on reply.

Bug: 3504182
Change-Id: I17d7fe4be002b302decb8f0dae95f33d452b7adc
This commit is contained in:
Jorge Lugo 2011-06-20 20:05:20 -07:00
parent b41602ed94
commit 67be1d5f6b
2 changed files with 106 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1034,6 +1034,16 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
}
}
private static void addAddresses(MultiAutoCompleteTextView view, String addresses) {
if (addresses == null) {
return;
}
Address[] unpackedAddresses = Address.unpack(addresses);
for (Address address : unpackedAddresses) {
addAddress(view, address.toString());
}
}
private static void addAddress(MultiAutoCompleteTextView view, String address) {
view.append(address + ", ");
}
@ -1990,26 +2000,39 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
// Start clean.
clearAddressViews();
/*
* If a reply-to was included with the message use that, otherwise use the from
* or sender address.
*/
// If Reply-to: addresses are included, use those; otherwise, use the From: address.
Address[] replyToAddresses = Address.unpack(message.mReplyTo);
if (replyToAddresses.length == 0) {
replyToAddresses = Address.unpack(message.mFrom);
}
addAddresses(mToView, replyToAddresses);
// Check if ourAddress is one of the replyToAddresses to decide how to populate To: field
String ourAddress = account.mEmailAddress;
boolean containsOurAddress = false;
for (Address address : replyToAddresses) {
if (ourAddress.equalsIgnoreCase(address.getAddress())) {
containsOurAddress = true;
break;
}
}
if (containsOurAddress) {
addAddresses(mToView, message.mTo);
} else {
addAddresses(mToView, replyToAddresses);
}
if (replyAll) {
// Keep a running list of addresses we're sending to
ArrayList<Address> allAddresses = new ArrayList<Address>();
String ourAddress = account.mEmailAddress;
for (Address address: replyToAddresses) {
allAddresses.add(address);
}
safeAddAddresses(message.mTo, ourAddress, mCcView, allAddresses);
if (!containsOurAddress) {
safeAddAddresses(message.mTo, ourAddress, mCcView, allAddresses);
}
safeAddAddresses(message.mCc, ourAddress, mCcView, allAddresses);
}
showCcBccFieldsIfFilled();

85
tests/src/com/android/email/activity/MessageComposeTests.java
View File

@ -66,6 +66,7 @@ public class MessageComposeTests
private long mCreatedAccountId = -1;
private String mSignature;
private static final String ACCOUNT = "account@android.com";
private static final String SENDER = "sender@android.com";
private static final String REPLYTO = "replyto@android.com";
private static final String RECIPIENT_TO = "recipient-to@android.com";
@ -190,9 +191,9 @@ public class MessageComposeTests
}
/**
* Test a couple of variations of processSourceMessage() for REPLY
* Test a couple of variations of processSourceMessage() for REPLY.
* To = Reply-To or From: (if REPLY)
* To = (Reply-To or From:) + To: + Cc: (if REPLY_ALL)
* To = (Reply-To or From:), Cc = + To: + Cc: (if REPLY_ALL)
* Subject = Re: Subject
* Body = empty (and has cursor)
*
@ -203,10 +204,12 @@ public class MessageComposeTests
Intent intent = new Intent(ACTION_REPLY);
final MessageCompose a = getActivity();
a.setIntent(intent);
final Account account = new Account();
account.mEmailAddress = ACCOUNT;
runTestOnUiThread(new Runnable() {
public void run() {
a.processSourceMessage(message, null);
a.processSourceMessage(message, account);
a.setInitialComposeText(null, null);
checkFields(SENDER + ", ", null, null, "Re: " + SUBJECT, null, null);
checkFocused(mMessageView);
@ -219,7 +222,7 @@ public class MessageComposeTests
runTestOnUiThread(new Runnable() {
public void run() {
resetViews();
a.processSourceMessage(message, null);
a.processSourceMessage(message, account);
a.setInitialComposeText(null, null);
checkFields(REPLYTO + ", ", null, null, "Re: " + SUBJECT, null, null);
checkFocused(mMessageView);
@ -227,12 +230,69 @@ public class MessageComposeTests
});
}
/**
* Tests similar cases as testProcessSourceMessageReply, but when sender is in From: (or
* Reply-to: if applicable) field.
*
* To = To (if REPLY)
* To = To, Cc = Cc (if REPLY_ALL)
* Subject = Re: Subject
* Body = empty (and has cursor)
*
* @throws MessagingException
* @throws Throwable
*/
public void testRepliesWithREplyToFields() throws MessagingException, Throwable {
final Message message = buildTestMessage(RECIPIENT_TO, SENDER, SUBJECT, BODY);
message.mCc = RECIPIENT_CC;
Intent intent = new Intent(ACTION_REPLY);
final MessageCompose a = getActivity();
a.setIntent(intent);
final Account account = new Account();
account.mEmailAddress = SENDER;
runTestOnUiThread(new Runnable() {
public void run() {
a.processSourceMessage(message, account);
a.setInitialComposeText(null, null);
checkFields(RECIPIENT_TO + ", ", null, null, "Re: " + SUBJECT, null, null);
checkFocused(mMessageView);
}
});
message.mFrom = null;
message.mReplyTo = Address.parseAndPack(SENDER);
runTestOnUiThread(new Runnable() {
public void run() {
resetViews();
a.processSourceMessage(message, account);
a.setInitialComposeText(null, null);
checkFields(RECIPIENT_TO + ", ", null, null, "Re: " + SUBJECT, null, null);
checkFocused(mMessageView);
}
});
a.setIntent(new Intent(ACTION_REPLY_ALL));
runTestOnUiThread(new Runnable() {
public void run() {
resetViews();
a.processSourceMessage(message, account);
a.setInitialComposeText(null, null);
checkFields(RECIPIENT_TO + ", ", RECIPIENT_CC + ", ", null,
"Re: " + SUBJECT, null, null);
checkFocused(mMessageView);
}
});
}
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.mEmailAddress = ACCOUNT;
account.mSignature = SIGNATURE;
runTestOnUiThread(new Runnable() {
public void run() {
@ -284,10 +344,12 @@ public class MessageComposeTests
Intent intent = new Intent(ACTION_REPLY);
final MessageCompose a = getActivity();
a.setIntent(intent);
final Account account = new Account();
account.mEmailAddress = ACCOUNT;
runTestOnUiThread(new Runnable() {
public void run() {
a.processSourceMessage(message, null);
a.processSourceMessage(message, account);
a.setInitialComposeText(null, null);
checkFields(UTF16_SENDER + ", ", null, null, "Re: " + UTF16_SUBJECT, null, null);
checkFocused(mMessageView);
@ -300,7 +362,7 @@ public class MessageComposeTests
runTestOnUiThread(new Runnable() {
public void run() {
resetViews();
a.processSourceMessage(message, null);
a.processSourceMessage(message, account);
a.setInitialComposeText(null, null);
checkFields(UTF16_REPLYTO + ", ", null, null, "Re: " + UTF16_SUBJECT, null, null);
checkFocused(mMessageView);
@ -317,10 +379,12 @@ public class MessageComposeTests
Intent intent = new Intent(ACTION_REPLY);
final MessageCompose a = getActivity();
a.setIntent(intent);
final Account account = new Account();
account.mEmailAddress = ACCOUNT;
runTestOnUiThread(new Runnable() {
public void run() {
a.processSourceMessage(message, null);
a.processSourceMessage(message, account);
a.setInitialComposeText(null, null);
checkFields(UTF32_SENDER + ", ", null, null, "Re: " + UTF32_SUBJECT, null, null);
checkFocused(mMessageView);
@ -333,7 +397,7 @@ public class MessageComposeTests
runTestOnUiThread(new Runnable() {
public void run() {
resetViews();
a.processSourceMessage(message, null);
a.processSourceMessage(message, account);
a.setInitialComposeText(null, null);
checkFields(UTF32_REPLYTO + ", ", null, null, "Re: " + UTF32_SUBJECT, null, null);
checkFocused(mMessageView);
@ -590,8 +654,9 @@ public class MessageComposeTests
*
* In this case, we're doing a "reply all"
* The user is CC2 (a "cc" recipient)
* The to should be: FROM, TO1, TO2, and TO3
* The cc should be: CC3 (CC1/CC4 are duplicates; CC2 is the our account's email address)
* The to should be: FROM
* The cc should be: TO1, TO2, ,TO3, and CC3 (CC1/CC4 are duplicates; CC2 is the our
* account's email address)
*/
public void testReplyAllAddresses3() throws Throwable {
final MessageCompose a = getActivity();