From d8ad4037b97b1a765a572f29d9a378d698807894 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Thu, 13 Apr 2017 22:01:05 +0200 Subject: fixed message merge logic. merge only messages with lower status --- src/main/java/de/pixart/messenger/entities/Message.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/main/java/de/pixart/messenger/entities') 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) ); } -- cgit v1.2.3