diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-24 23:18:19 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-24 23:18:19 +0200 |
| commit | 8171633eb9f43e43f39fd1687467d85cdb132b0c (patch) | |
| tree | 93261afa3f88f7c81bac57378d80d521bb8029f2 /src/eu/siacs/conversations/entities | |
| parent | 8fb898541286d737491ac156e8b327b534d4e2a3 (diff) | |
don't merge downloadable messages
Diffstat (limited to 'src/eu/siacs/conversations/entities')
| -rw-r--r-- | src/eu/siacs/conversations/entities/Message.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/entities/Message.java b/src/eu/siacs/conversations/entities/Message.java index 68a71d4a..212eb049 100644 --- a/src/eu/siacs/conversations/entities/Message.java +++ b/src/eu/siacs/conversations/entities/Message.java @@ -327,7 +327,9 @@ public class Message extends AbstractEntity { .getStatus() == Message.STATUS_SEND_RECEIVED) && (message .getStatus() == Message.STATUS_UNSEND || message.getStatus() == Message.STATUS_SEND || message - .getStatus() == Message.STATUS_SEND_DISPLAYED))))); + .getStatus() == Message.STATUS_SEND_DISPLAYED)))) + && !message.bodyContainsDownloadable() + && !this.bodyContainsDownloadable()); } public String getMergedBody() { |