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

fixed message merge logic. merge only messages with lower status

This commit is contained in:
Daniel Gultsch 2017-04-12 22:24:29 +02:00
parent 4fd11a4c2b
commit 8742194f4b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -506,10 +506,9 @@ public class Message extends AbstractEntity {
return a == b || ( return a == b || (
(a == Message.STATUS_SEND_RECEIVED && b == Message.STATUS_UNSEND) (a == Message.STATUS_SEND_RECEIVED && b == Message.STATUS_UNSEND)
|| (a == Message.STATUS_SEND_RECEIVED && b == Message.STATUS_SEND) || (a == Message.STATUS_SEND_RECEIVED && b == Message.STATUS_SEND)
|| (a == Message.STATUS_UNSEND && b == Message.STATUS_SEND) || (a == Message.STATUS_SEND_RECEIVED && b == Message.STATUS_WAITING)
|| (a == Message.STATUS_UNSEND && b == Message.STATUS_SEND_RECEIVED)
|| (a == Message.STATUS_SEND && b == Message.STATUS_UNSEND) || (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)
); );
} }