From c3ec3ea70a1961ac41d858930217d3932e886625 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sun, 29 May 2016 10:32:07 +0200 Subject: [PATCH] don't merge messages over the char limit --- src/main/java/eu/siacs/conversations/entities/Message.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index 4b6877119..3a924e530 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -464,6 +464,7 @@ public class Message extends AbstractEntity { this.getCounterpart().equals(message.getCounterpart()) && this.edited() == message.edited() && (message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) && + this.getBody().length() + message.getBody().length() <= Config.MAX_DISPLAY_MESSAGE_CHARS && !GeoHelper.isGeoUri(message.getBody()) && !GeoHelper.isGeoUri(this.body) && message.treatAsDownloadable() == Decision.NEVER &&