Do not allow SMS and Signal messages to cluster.

Fixes #9214
fork-5.53.8
Greyson Parrelli 2022-02-04 10:27:11 -05:00 zatwierdzone przez Alex Hart
rodzic e2d86067cc
commit 988728be3e
1 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -1677,7 +1677,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
!current.getRecipient().equals(previous.get().getRecipient()); !current.getRecipient().equals(previous.get().getRecipient());
} else { } else {
return !previous.isPresent() || previous.get().isUpdate() || !DateUtils.isSameDay(current.getTimestamp(), previous.get().getTimestamp()) || 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(); !current.getRecipient().equals(next.get().getRecipient()) || !current.getReactions().isEmpty();
} else { } else {
return !next.isPresent() || next.get().isUpdate() || !DateUtils.isSameDay(current.getTimestamp(), next.get().getTimestamp()) || 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();
} }
} }