moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-06 17:25:01 -05:00
Code Issues Releases Wiki Activity

require encrypted to be the same for messages to get merged

Browse Source
This commit is contained in:
iNPUTmice 2014-08-31 15:54:53 +02:00
parent 8f8d4e320d
commit 1cc16161ef
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/eu/siacs/conversations/entities/Message.java
View File

@ -315,8 +315,10 @@ public class Message extends AbstractEntity {
if (message == null) {
return false;
}
return (this.getType() == Message.TYPE_TEXT
return (message.getType() == Message.TYPE_TEXT
&& message.getEncryption() != Message.ENCRYPTION_PGP
&& this.getType() == message.getType()
&& this.getEncryption() == message.getEncryption()
&& this.getCounterpart().equals(message.getCounterpart())
&& (message.getTimeSent() - this.getTimeSent()) <= 20000 && ((this
.getStatus() == message.getStatus()) || (this.getStatus() == Message.STATUS_SEND && message