diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-29 19:56:36 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-29 19:56:36 +0200 |
| commit | e3b7f9dba9c00d13e5c4658385f9527b7435ef3a (patch) | |
| tree | d7b78311f54fbb7765bb827b3f08be8891c53171 /src/main/java | |
| parent | aba7c2ea2f996db05efd8cf9867c3544b2521f2c (diff) | |
| parent | 107ab85a22bda92d7cb1d10ea2494c7280bccf67 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
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 && |