do not merge oob messages

Daniel Gultsch created 5 years ago

Change summary

src/main/java/eu/siacs/conversations/entities/Message.java | 2 ++
1 file changed, 2 insertions(+)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Message.java

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