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

do not merge oob messages

This commit is contained in:
Daniel Gultsch 2020-03-02 11:10:38 +01:00
parent d353372768
commit 08bc3ca0d5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -613,6 +613,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
this.getBody().length() + message.getBody().length() <= Config.MAX_DISPLAY_MESSAGE_CHARS && this.getBody().length() + message.getBody().length() <= Config.MAX_DISPLAY_MESSAGE_CHARS &&
!message.isGeoUri() && !message.isGeoUri() &&
!this.isGeoUri() && !this.isGeoUri() &&
!message.isOOb() &&
!this.isOOb() &&
!message.treatAsDownloadable() && !message.treatAsDownloadable() &&
!this.treatAsDownloadable() && !this.treatAsDownloadable() &&
!message.getBody().startsWith(ME_COMMAND) && !message.getBody().startsWith(ME_COMMAND) &&