moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-28 11:42:15 -05:00
Code Issues Releases Wiki Activity

changed message merger a bit

Browse Source
This commit is contained in:
iNPUTmice 2014-09-21 22:58:19 +02:00
parent 49adf4f69a
commit 98a8fd4d05
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,7 +248,8 @@ public class Message extends AbstractEntity {
if (presence == null) { if (presence == null) {
this.counterpart = this.counterpart.split("/", 2)[0]; this.counterpart = this.counterpart.split("/", 2)[0];
} else { } else {
this.counterpart = this.counterpart.split("/",2)[0] + "/" + presence; this.counterpart = this.counterpart.split("/", 2)[0] + "/"
+ presence;
} }
} }
@ -326,12 +327,12 @@ public class Message extends AbstractEntity {
&& this.getType() == message.getType() && this.getType() == message.getType()
&& this.getEncryption() == message.getEncryption() && this.getEncryption() == message.getEncryption()
&& this.getCounterpart().equals(message.getCounterpart()) && this.getCounterpart().equals(message.getCounterpart())
&& (message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) && (message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) && ((this
&& ((this.getStatus() == message.getStatus()) .getStatus() == message.getStatus() || ((this.getStatus() == Message.STATUS_SEND || this
|| (this.getStatus() == Message.STATUS_SEND && (message.getStatus() == Message.STATUS_UNSEND .getStatus() == Message.STATUS_SEND_RECEIVED) && (message
|| message.getStatus() == Message.STATUS_SEND)) .getStatus() == Message.STATUS_UNSEND
|| (this.getStatus() == Message.STATUS_SEND_RECEIVED || message.getStatus() == Message.STATUS_SEND || message
&& message.getStatus() == Message.STATUS_SEND_DISPLAYED))); .getStatus() == Message.STATUS_SEND_DISPLAYED)))));
} }
public String getMergedBody() { public String getMergedBody() {