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

. Added defensive code against empty self BCC address 

This fixed issues 639 & 646
This commit is contained in:
Bao-Long Nguyen-Trong 2009-09-25 17:02:50 +00:00
parent f3312eb064
commit c2ca739293
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -516,7 +516,11 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc
}
if (!ACTION_EDIT_DRAFT.equals(action)) {
addAddress(mBccView, new Address(mAccount.getAlwaysBcc(), ""));
String bccAddress = mAccount.getAlwaysBcc();
if (bccAddress!=null
&& !"".equals(bccAddress)) {
addAddress(mBccView, new Address(mAccount.getAlwaysBcc(), ""));
}
}
Log.d(Email.LOG_TAG, "action = " + action + ", mAccount = " + mAccount + ", mFolder = " + mFolder + ", mSourceMessageUid = " + mSourceMessageUid);

12
src/com/android/email/mail/Address.java
View File

@ -70,10 +70,15 @@ public class Address {
*/
public static Address[] parseUnencoded(String addressList) {
List<Address> addresses = new ArrayList<Address>();
if (addressList!=null) {
if (addressList!=null
&& !"".equals(addressList)) {
Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(addressList);
for (Rfc822Token token : tokens) {
addresses.add(new Address(token.getAddress(), token.getName()));
String address = token.getAddress();
if (address!=null
&& !"".equals(address)) {
addresses.add(new Address(token.getAddress(), token.getName()));
}
}
}
return addresses.toArray(new Address[0]);
@ -88,7 +93,8 @@ public class Address {
*/
public static Address[] parse(String addressList) {
ArrayList<Address> addresses = new ArrayList<Address>();
if (addressList == null) {
if (addressList == null
&& !"".equals(addressList)) {
return new Address[] {};
}
try {