narayana/Conversations
3
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

allow to merge private messages

Browse source
This commit is contained in:
kosyak 2023-12-17 18:44:35 +01:00
parent c09551b4c0
commit 9ebb719d71
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/entities/Message.java
View file

@ -702,7 +702,7 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
public boolean mergeable(final Message message) {
return message != null &&
(message.getType() == Message.TYPE_TEXT &&
((message.getType() == Message.TYPE_TEXT || message.getType() == Message.TYPE_PRIVATE) &&
this.getTransferable() == null &&
message.getTransferable() == null &&
message.getEncryption() != Message.ENCRYPTION_PGP &&