|
|
@ -281,15 +281,14 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess |
|
|
|
else |
|
|
|
ivFlagged.setVisibility(message.count - message.unflagged > 0 ? View.VISIBLE : View.GONE); |
|
|
|
|
|
|
|
tvFrom.setText(MessageHelper.getFormattedAddresses(message.from, false)); |
|
|
|
|
|
|
|
if (EntityFolder.DRAFTS.equals(message.folderType) || |
|
|
|
EntityFolder.OUTBOX.equals(message.folderType) || |
|
|
|
EntityFolder.SENT.equals(message.folderType)) { |
|
|
|
tvFrom.setText(MessageHelper.getFormattedAddresses(message.to, false)); |
|
|
|
EntityFolder.SENT.equals(message.folderType)) |
|
|
|
tvTime.setText(DateUtils.getRelativeTimeSpanString(context, message.sent == null ? message.received : message.sent)); |
|
|
|
} else { |
|
|
|
tvFrom.setText(MessageHelper.getFormattedAddresses(message.from, false)); |
|
|
|
else |
|
|
|
tvTime.setText(DateUtils.getRelativeTimeSpanString(context, message.received)); |
|
|
|
} |
|
|
|
|
|
|
|
tvSize.setText(message.size == null ? null : Helper.humanReadableByteCount(message.size, true)); |
|
|
|
tvSize.setTypeface(null, message.content ? Typeface.NORMAL : Typeface.BOLD); |
|
|
@ -367,14 +366,12 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess |
|
|
|
if (show_expanded) { |
|
|
|
if (EntityFolder.DRAFTS.equals(message.folderType) || |
|
|
|
EntityFolder.OUTBOX.equals(message.folderType) || |
|
|
|
EntityFolder.SENT.equals(message.folderType)) { |
|
|
|
tvFromEx.setText(MessageHelper.getFormattedAddresses(message.to, true)); |
|
|
|
EntityFolder.SENT.equals(message.folderType)) |
|
|
|
tvTimeEx.setText(df.format(new Date(message.sent == null ? message.received : message.sent))); |
|
|
|
} else { |
|
|
|
tvFromEx.setText(MessageHelper.getFormattedAddresses(message.from, true)); |
|
|
|
else |
|
|
|
tvTimeEx.setText(df.format(new Date(message.received))); |
|
|
|
} |
|
|
|
|
|
|
|
tvFromEx.setText(MessageHelper.getFormattedAddresses(message.from, true)); |
|
|
|
tvTo.setText(MessageHelper.getFormattedAddresses(message.to, true)); |
|
|
|
tvReplyTo.setText(MessageHelper.getFormattedAddresses(message.reply, true)); |
|
|
|
tvCc.setText(MessageHelper.getFormattedAddresses(message.cc, true)); |
|
|
|