diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-08-31 18:21:46 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-08-31 18:21:46 +0200 |
| commit | bda7724e317dd46f831df29c4c920b3913c533cb (patch) | |
| tree | e5c072207e2c6850a3becd1de8657365ec7eb4b5 /src/eu/siacs/conversations/entities | |
| parent | 28fa48704d4084617d7e32e4a10f785c4b996163 (diff) | |
improvements for merge conditions
Diffstat (limited to 'src/eu/siacs/conversations/entities')
| -rw-r--r-- | src/eu/siacs/conversations/entities/Message.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/entities/Message.java b/src/eu/siacs/conversations/entities/Message.java index 9e9779118..2dc1bfb5f 100644 --- a/src/eu/siacs/conversations/entities/Message.java +++ b/src/eu/siacs/conversations/entities/Message.java @@ -1,5 +1,6 @@ package eu.siacs.conversations.entities; +import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.xmpp.jingle.JingleConnection; import android.content.ContentValues; @@ -320,9 +321,12 @@ public class Message extends AbstractEntity { && 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 - .getStatus() == Message.STATUS_UNSEND))); + && (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() { |