sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

simplified message merge condition

This commit is contained in:
iNPUTmice 2014-11-18 14:49:49 +01:00
parent 10bf2b77a8
commit 1122e084a0
1 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,14 +69,14 @@ public class Message extends AbstractEntity {
} }
public Message(Conversation conversation, String body, int encryption) { public Message(Conversation conversation, String body, int encryption) {
this(conversation,body,encryption,STATUS_UNSEND); this(conversation, body, encryption, STATUS_UNSEND);
} }
public Message(Conversation conversation, String body, int encryption, int status) { public Message(Conversation conversation, String body, int encryption, int status) {
this(java.util.UUID.randomUUID().toString(), conversation.getUuid(), this(java.util.UUID.randomUUID().toString(), conversation.getUuid(),
conversation.getContactJid().toBareJid(), null, body, System conversation.getContactJid().toBareJid(), null, body, System
.currentTimeMillis(), encryption, .currentTimeMillis(), encryption,
status, TYPE_TEXT, null,null); status, TYPE_TEXT, null, null);
this.conversation = conversation; this.conversation = conversation;
} }
@ -100,7 +100,7 @@ public class Message extends AbstractEntity {
Jid jid; Jid jid;
try { try {
String value = cursor.getString(cursor.getColumnIndex(COUNTERPART)); String value = cursor.getString(cursor.getColumnIndex(COUNTERPART));
if (value!=null) { if (value != null) {
jid = Jid.fromString(value); jid = Jid.fromString(value);
} else { } else {
jid = null; jid = null;
@ -111,7 +111,7 @@ public class Message extends AbstractEntity {
Jid trueCounterpart; Jid trueCounterpart;
try { try {
String value = cursor.getString(cursor.getColumnIndex(TRUE_COUNTERPART)); String value = cursor.getString(cursor.getColumnIndex(TRUE_COUNTERPART));
if (value!=null) { if (value != null) {
trueCounterpart = Jid.fromString(value); trueCounterpart = Jid.fromString(value);
} else { } else {
trueCounterpart = null; trueCounterpart = null;
@ -149,7 +149,7 @@ public class Message extends AbstractEntity {
} else { } else {
values.put(COUNTERPART, counterpart.toString()); values.put(COUNTERPART, counterpart.toString());
} }
if (trueCounterpart == null ) { if (trueCounterpart == null) {
values.putNull(TRUE_COUNTERPART); values.putNull(TRUE_COUNTERPART);
} else { } else {
values.put(TRUE_COUNTERPART, trueCounterpart.toString()); values.put(TRUE_COUNTERPART, trueCounterpart.toString());
@ -225,12 +225,12 @@ public class Message extends AbstractEntity {
this.status = status; this.status = status;
} }
public void setRelativeFilePath(String path) { public String getRelativeFilePath() {
this.relativeFilePath = path; return this.relativeFilePath;
} }
public String getRelativeFilePath() { public void setRelativeFilePath(String path) {
return this.relativeFilePath; this.relativeFilePath = path;
} }
public String getRemoteMsgId() { public String getRemoteMsgId() {
@ -286,14 +286,7 @@ public class Message extends AbstractEntity {
} }
public boolean equals(Message message) { public boolean equals(Message message) {
if ((this.remoteMsgId != null) && (this.body != null) return (this.remoteMsgId != null) && (this.body != null) && (this.counterpart != null) && this.remoteMsgId.equals(message.getRemoteMsgId()) && this.body.equals(message.getBody()) && this.counterpart.equals(message.getCounterpart());
&& (this.counterpart != null)) {
return this.remoteMsgId.equals(message.getRemoteMsgId())
&& this.body.equals(message.getBody())
&& this.counterpart.equals(message.getCounterpart());
} else {
return false;
}
} }
public Message next() { public Message next() {
@ -327,26 +320,8 @@ public class Message extends AbstractEntity {
return this.mPreviousMessage; return this.mPreviousMessage;
} }
public boolean mergeable(Message message) { public boolean mergeable(final Message message) {
if (message == null) { return message != null && (message.getType() == Message.TYPE_TEXT && this.getDownloadable() == null && message.getDownloadable() == null && message.getEncryption() != Message.ENCRYPTION_PGP && this.getType() == message.getType() && this.getStatus() == message.getStatus() && this.getEncryption() == message.getEncryption() && this.getCounterpart() != null && this.getCounterpart().equals(message.getCounterpart()) && (message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) && !message.bodyContainsDownloadable() && !this.bodyContainsDownloadable());
return false;
}
return (message.getType() == Message.TYPE_TEXT
&& this.getDownloadable() == null
&& message.getDownloadable() == null
&& message.getEncryption() != Message.ENCRYPTION_PGP
&& this.getType() == message.getType()
&& this.getEncryption() == message.getEncryption()
&& this.getCounterpart() != null
&& this.getCounterpart().equals(message.getCounterpart())
&& (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))))
&& !message.bodyContainsDownloadable()
&& !this.bodyContainsDownloadable());
} }
public String getMergedBody() { public String getMergedBody() {
@ -358,12 +333,7 @@ public class Message extends AbstractEntity {
} }
public int getMergedStatus() { public int getMergedStatus() {
Message next = this.next(); return getStatus();
if (this.mergeable(next)) {
return next.getMergedStatus();
} else {
return getStatus();
}
} }
public long getMergedTimeSent() { public long getMergedTimeSent() {