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

Merge "Parse "From" addresses when constructing ConversationInfo" into jb-ub-mail-ur10

Browse Source
This commit is contained in:
Tony Mantler 2013-10-09 17:33:48 +00:00 committed by Android (Google) Code Review
commit 06009f28f0
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,8 @@ import android.os.RemoteException;
import android.provider.BaseColumns;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.text.util.Rfc822Token;
import android.text.util.Rfc822Tokenizer;
import android.util.Base64;
import android.util.Log;
import android.util.SparseArray;
@ -3657,8 +3659,6 @@ public class EmailProvider extends ContentProvider {
}
private ConversationInfo generateConversationInfo() {
// TODO This populates a very minimal ConversationInfo because it is currently only
// needed by NestedFolderTeaserView
final int numMessages = getInt(getColumnIndex(ConversationColumns.NUM_MESSAGES));
final ConversationInfo conversationInfo = new ConversationInfo(numMessages);
@ -3667,8 +3667,16 @@ public class EmailProvider extends ContentProvider {
final boolean isRead = getInt(getColumnIndex(ConversationColumns.READ)) != 0;
final boolean isStarred = getInt(getColumnIndex(ConversationColumns.STARRED)) != 0;
final String senderString = getString(getColumnIndex(MessageColumns.DISPLAY_NAME));
// TODO We probably want to parse out the email from this
final String email = getString(getColumnIndex(MessageColumns.FROM_LIST));
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();
} else {
LogUtils.d(TAG, "Couldn't parse email address");
email = fromString;
}
final MessageInfo messageInfo = new MessageInfo(isRead, isStarred, senderString,
0 /* priority */, email);