From 8742194f4b20bfd75ce12fdecca7e9afc78ad8dd Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 12 Apr 2017 22:24:29 +0200 Subject: [PATCH] fixed message merge logic. merge only messages with lower status --- src/main/java/eu/siacs/conversations/entities/Message.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index 61881c294..f06d68aa0 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -506,10 +506,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) ); }