am 32ce9913: am 2a709716: Merge "Marking conversations read/unread in the TL removes the snippet text" into ub-mail-master

* commit '32ce991317f6a071431c2f55fcf41f5aee9a2759':
  Marking conversations read/unread in the TL removes the snippet text
This commit is contained in:
James Lemieux 2014-07-24 23:32:45 +00:00 committed by Android Git Automerger
commit f3704242ee

View File

@ -176,6 +176,8 @@ public class EmailConversationCursor extends CursorWrapper implements
final ConversationInfo conversationInfo = new ConversationInfo(numMessages); final ConversationInfo conversationInfo = new ConversationInfo(numMessages);
conversationInfo.firstSnippet = getString(getColumnIndex(ConversationColumns.SNIPPET)); conversationInfo.firstSnippet = getString(getColumnIndex(ConversationColumns.SNIPPET));
conversationInfo.lastSnippet = conversationInfo.firstSnippet;
conversationInfo.firstUnreadSnippet = conversationInfo.firstSnippet;
final boolean isRead = getInt(getColumnIndex(ConversationColumns.READ)) != 0; final boolean isRead = getInt(getColumnIndex(ConversationColumns.READ)) != 0;
final String senderString = getString(getColumnIndex(EmailContent.MessageColumns.DISPLAY_NAME)); final String senderString = getString(getColumnIndex(EmailContent.MessageColumns.DISPLAY_NAME));