From cf2af6cb4dac62c0014d815e0869cb8120567738 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 7 Dec 2015 00:11:03 -0500 Subject: [PATCH] Fixed timestamp logic --- .../com/moez/QKSMS/ui/messagelist/MessageListAdapter.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java index e3751009..3f332569 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/ui/messagelist/MessageListAdapter.java @@ -290,8 +290,11 @@ public class MessageListAdapter extends RecyclerCursorAdapter= MAX_DURATION; // If the messages are from different people, then we don't care about any of the other checks, - // we need to show the avatar/timestamp - if (messageItem.mAddress != null && messageItem2.mAddress != null && !messageItem.mAddress.equals(messageItem2.mAddress)) { + // we need to show the avatar/timestamp. This is used for group chats, which is why we want + // both to be incoming messages + if (messageItem.mAddress != null && messageItem2.mAddress != null && + !messageItem.mAddress.equals(messageItem2.mAddress) && + !messageItem.isOutgoingMessage() && messageItem2.isOutgoingMessage()) { showAvatar = true; showTimestamp = true; }