aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schneppe <christian.schneppe@pix-art.de>2020-03-16 19:38:31 +0100
committerChristian Schneppe <christian.schneppe@pix-art.de>2020-03-16 19:38:31 +0100
commit4c6599b39579d53c7d7316ab223ba370fde9ff95 (patch)
tree8c315f9eef64d3ccfe1af393c0a7ba8174e94ab3
parent755625eec548db50654ca6eebb0feb3ce44225aa (diff)
do not merge oob messages
-rw-r--r--src/main/java/de/pixart/messenger/entities/Message.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java
index b2297cd08..21ab33975 100644
--- a/src/main/java/de/pixart/messenger/entities/Message.java
+++ b/src/main/java/de/pixart/messenger/entities/Message.java
@@ -637,6 +637,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
!this.isGeoUri() &&
!message.isWebUri() &&
!this.isWebUri() &&
+ !message.isOOb() &&
+ !this.isOOb() &&
!message.treatAsDownloadable() &&
!this.treatAsDownloadable() &&
!message.getBody().startsWith(ME_COMMAND) &&