aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-02-26 19:45:01 +0100
committerChristian Schneppe <christian@pix-art.de>2018-02-26 19:45:01 +0100
commita33032d9b70511561162bdab66c101a5e3e4a58e (patch)
treecc0469fb13fd341945137a8e5a535a2397e04fe8 /src/main
parentef5bcf1809cd59520ecd46dc03cb239bca3034f7 (diff)
do not merge bug reports
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/entities/Message.java3
1 files changed, 2 insertions, 1 deletions
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)
);
}