diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-05-29 10:32:07 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-05-29 10:32:07 +0200 |
| commit | c3ec3ea70a1961ac41d858930217d3932e886625 (patch) | |
| tree | 01ce94e1c98eec1716343d21970b15bca4c9a97d /src/main/java | |
| parent | 2c55954ddda1d84a32150b430fe80ff8084612a1 (diff) | |
don't merge messages over the char limit
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Message.java | 1 |
1 files changed, 1 insertions, 0 deletions
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 && |