empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Do not allow SMS and Signal messages to cluster.

Browse source 
Fixes #9214
This commit is contained in:
Greyson Parrelli 2022-02-04 10:27:11 -05:00 • committed by Alex Hart
parent e2d86067cc
commit 988728be3e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View file

@ -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();
}
}