PeterCxy/cheogram
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

do not merge bug reports

Browse source
This commit is contained in:
Daniel Gultsch 2018-02-25 14:28:14 +01:00
parent 47dfe3c2e2
commit 7e09fac1da
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/entities/Message.java
View file

@ -568,7 +568,8 @@ public class Message extends AbstractEntity {
!message.bodyIsOnlyEmojis() && !message.bodyIsOnlyEmojis() &&
((this.axolotlFingerprint == null && message.axolotlFingerprint == null) || this.axolotlFingerprint.equals(message.getFingerprint())) && ((this.axolotlFingerprint == null && message.axolotlFingerprint == null) || this.axolotlFingerprint.equals(message.getFingerprint())) &&
UIHelper.sameDay(message.getTimeSent(),this.getTimeSent()) && 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)
); );
} }