moparisthebest
/
Conversations
mirror of https://github.com/moparisthebest/Conversations
1
0
Fork 0
Code Issues Releases Wiki Activity

changed message merger a bit

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

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

@ -246,9 +246,10 @@ public class Message extends AbstractEntity {
public void setPresence(String presence) {
if (presence == null) {
this.counterpart = this.counterpart.split("/",2)[0];
this.counterpart = this.counterpart.split("/", 2)[0];
} else {
this.counterpart = this.counterpart.split("/",2)[0] + "/" + presence;
this.counterpart = this.counterpart.split("/", 2)[0] + "/"
+ presence;
}
}
@ -257,7 +258,7 @@ public class Message extends AbstractEntity {
}
public String getPresence() {
String[] counterparts = this.counterpart.split("/",2);
String[] counterparts = this.counterpart.split("/", 2);
if (counterparts.length == 2) {
return counterparts[1];
} else {
@ -326,12 +327,12 @@ public class Message extends AbstractEntity {
&& this.getType() == message.getType()
&& this.getEncryption() == message.getEncryption()
&& this.getCounterpart().equals(message.getCounterpart())
&& (message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000)
&& ((this.getStatus() == message.getStatus())
|| (this.getStatus() == Message.STATUS_SEND && (message.getStatus() == Message.STATUS_UNSEND
|| message.getStatus() == Message.STATUS_SEND))
|| (this.getStatus() == Message.STATUS_SEND_RECEIVED
&& message.getStatus() == Message.STATUS_SEND_DISPLAYED)));
&& (message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) && ((this
.getStatus() == message.getStatus() || ((this.getStatus() == Message.STATUS_SEND || this
.getStatus() == Message.STATUS_SEND_RECEIVED) && (message
.getStatus() == Message.STATUS_UNSEND
|| message.getStatus() == Message.STATUS_SEND || message
.getStatus() == Message.STATUS_SEND_DISPLAYED)))));
}
public String getMergedBody() {