diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-04-13 22:01:05 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-04-13 22:01:05 +0200 |
| commit | d8ad4037b97b1a765a572f29d9a378d698807894 (patch) | |
| tree | f208b554c6fa246ce0eea059e68b91ee1c8a5fa3 /src/main/java/de/pixart/messenger/entities | |
| parent | 8f771c2eacff5b86ec027853be4745e7d6ea73ea (diff) | |
fixed message merge logic. merge only messages with lower status
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities')
| -rw-r--r-- | src/main/java/de/pixart/messenger/entities/Message.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java index 633feed12..7aa8ca513 100644 --- a/src/main/java/de/pixart/messenger/entities/Message.java +++ b/src/main/java/de/pixart/messenger/entities/Message.java @@ -517,10 +517,9 @@ public class Message extends AbstractEntity { return a == b || ( (a == Message.STATUS_SEND_RECEIVED && b == Message.STATUS_UNSEND) || (a == Message.STATUS_SEND_RECEIVED && b == Message.STATUS_SEND) - || (a == Message.STATUS_UNSEND && b == Message.STATUS_SEND) - || (a == Message.STATUS_UNSEND && b == Message.STATUS_SEND_RECEIVED) + || (a == Message.STATUS_SEND_RECEIVED && b == Message.STATUS_WAITING) || (a == Message.STATUS_SEND && b == Message.STATUS_UNSEND) - || (a == Message.STATUS_SEND && b == Message.STATUS_SEND_RECEIVED) + || (a == Message.STATUS_SEND && b == Message.STATUS_WAITING) ); } |