From d9d298eb216771f79db291f78da7fd52eb15427a Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 26 Nov 2015 02:09:06 -0500 Subject: [PATCH] Fix group message UI grouping logic --- .../ui/messagelist/MessageListAdapter.java | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 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 0d9bc4b8..e3751009 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 @@ -288,9 +288,16 @@ 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)) { + showAvatar = true; + showTimestamp = true; + } } - holder.mDateView.setVisibility(showTimestamp? View.VISIBLE : View.GONE); + holder.mDateView.setVisibility(showTimestamp ? View.VISIBLE : View.GONE); holder.mSpace.setVisibility(showAvatar ? View.VISIBLE : View.GONE); holder.mBodyTextView.setBackgroundResource(showAvatar ? (messageItem.isMe() ? ThemeManager.getSentBubbleRes() : ThemeManager.getReceivedBubbleRes()) : (messageItem.isMe() ? @@ -401,15 +408,16 @@ public class MessageListAdapter extends RecyclerCursorAdapter { + if (messageItem1 != null && messageItem1.getMessageId() == messageItem1.getMessageId()) { + messageItem1.setCachedFormattedMessage(null); + bindGrouping(holder, messageItem); + bindBody(holder, messageItem); + bindTimestamp(holder, messageItem); + bindAvatar(holder, messageItem); + bindMmsView(holder, messageItem); + bindIndicators(holder, messageItem); + bindVcard(holder, messageItem); } }); } else {