From 988728be3eda7b2c5249676fd3f53b6b7fd810dd Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 4 Feb 2022 10:27:11 -0500 Subject: [PATCH] Do not allow SMS and Signal messages to cluster. Fixes #9214 --- .../thoughtcrime/securesms/conversation/ConversationItem.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index 69e3adcbdc..619caecb2b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -1677,7 +1677,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo !current.getRecipient().equals(previous.get().getRecipient()); } else { return !previous.isPresent() || previous.get().isUpdate() || !DateUtils.isSameDay(current.getTimestamp(), previous.get().getTimestamp()) || - current.isOutgoing() != previous.get().isOutgoing(); + current.isOutgoing() != previous.get().isOutgoing() || previous.get().isSecure() != current.isSecure(); } } @@ -1687,7 +1687,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo !current.getRecipient().equals(next.get().getRecipient()) || !current.getReactions().isEmpty(); } else { return !next.isPresent() || next.get().isUpdate() || !DateUtils.isSameDay(current.getTimestamp(), next.get().getTimestamp()) || - current.isOutgoing() != next.get().isOutgoing() || !current.getReactions().isEmpty(); + current.isOutgoing() != next.get().isOutgoing() || !current.getReactions().isEmpty() || next.get().isSecure() != current.isSecure(); } }