From a33032d9b70511561162bdab66c101a5e3e4a58e Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Mon, 26 Feb 2018 19:45:01 +0100 Subject: do not merge bug reports --- src/main/java/de/pixart/messenger/entities/Message.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java index a2b75853d..859999309 100644 --- a/src/main/java/de/pixart/messenger/entities/Message.java +++ b/src/main/java/de/pixart/messenger/entities/Message.java @@ -572,7 +572,8 @@ public class Message extends AbstractEntity { !message.isXmppUri() && ((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) ); } -- cgit v1.2.3