From 7e09fac1da1a8e3783dbc40952f3324acc57ad84 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 25 Feb 2018 14:28:14 +0100 Subject: [PATCH] do not merge bug reports --- src/main/java/eu/siacs/conversations/entities/Message.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index 5187658b5..fd5f1a8a9 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -568,7 +568,8 @@ public class Message extends AbstractEntity { !message.bodyIsOnlyEmojis() && ((this.axolotlFingerprint == null && message.axolotlFingerprint == null) || this.axolotlFingerprint.equals(message.getFingerprint())) && UIHelper.sameDay(message.getTimeSent(),this.getTimeSent()) && - this.getReadByMarkers().equals(message.getReadByMarkers()) + this.getReadByMarkers().equals(message.getReadByMarkers()) && + !this.conversation.getJid().toBareJid().toString().equals(Config.BUG_REPORTS) ); }