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

Merge "Add null check before passing from address to Rfc822Tokenizer" into jb-ub-mail-ur10

This commit is contained in:
Tony Mantler 2013-10-10 18:45:49 +00:00 committed by Android (Google) Code Review
parent 03f56f2c1a 22f0c87d5f
commit 8117953140
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/email/provider/EmailProvider.java
View File

@ -3678,13 +3678,18 @@ public class EmailProvider extends ContentProvider {
final String senderString = getString(getColumnIndex(MessageColumns.DISPLAY_NAME));
final String fromString = getString(getColumnIndex(MessageColumns.FROM_LIST));
final Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(fromString);
final String email;
if (tokens.length > 0) {
email = tokens[0].getAddress();
if (fromString != null) {
final Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(fromString);
if (tokens.length > 0) {
email = tokens[0].getAddress();
} else {
LogUtils.d(TAG, "Couldn't parse email address");
email = fromString;
}
} else {
LogUtils.d(TAG, "Couldn't parse email address");
email = fromString;
email = null;
}
final MessageInfo messageInfo = new MessageInfo(isRead, isStarred, senderString,