moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-30 20:52:21 -05:00
Code Issues Releases Wiki Activity

changed message duplicate finder

Browse Source
This commit is contained in:
iNPUTmice 2015-01-20 22:54:58 +01:00
parent 6dc53c2b35
commit 7839438f51
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/eu/siacs/conversations/entities/Message.java
View File

@ -311,12 +311,17 @@ public class Message extends AbstractEntity {
public boolean equals(Message message) { public boolean equals(Message message) {
if (this.serverMsgId != null && message.getServerMsgId() != null) { if (this.serverMsgId != null && message.getServerMsgId() != null) {
return this.serverMsgId.equals(message.getServerMsgId()); return this.serverMsgId.equals(message.getServerMsgId());
} else if (this.body == null || this.counterpart == null) {
return false;
} else if (message.getRemoteMsgId() != null) {
return (message.getRemoteMsgId().equals(this.remoteMsgId) || message.getRemoteMsgId().equals(this.uuid))
&& this.counterpart.equals(message.getCounterpart())
&& this.body.equals(message.getBody());
} else { } else {
return this.body != null return this.remoteMsgId == null
&& this.counterpart != null && this.counterpart.equals(message.getCounterpart())
&& ((this.remoteMsgId != null && this.remoteMsgId.equals(message.getRemoteMsgId())) && this.body.equals(message.getBody())
|| this.uuid.equals(message.getRemoteMsgId())) && this.body.equals(message.getBody()) && Math.abs(this.getTimeSent() - message.getTimeSent()) < Config.PING_TIMEOUT * 500;
&& this.counterpart.equals(message.getCounterpart());
} }
} }