diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-07-29 01:57:08 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-07-29 01:57:08 +0200 |
| commit | 17bc4fb6cd2f52ce7bfbc03540b88cad3ebc5f26 (patch) | |
| tree | 11c661809ec19d814972dcf7c8896ddbd46f8a03 /src/main/java | |
| parent | 8f14d2bfbd1e3e6697a5afccfc2512f98b55b702 (diff) | |
show http downloaded images in notification
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/NotificationService.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java index 47f0347fa..90e4d216d 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java @@ -332,9 +332,10 @@ public class NotificationService { private Message getImage(final Iterable<Message> messages) { for (final Message message : messages) { - if (message.getType() == Message.TYPE_IMAGE + if (message.getType() != Message.TYPE_TEXT && message.getTransferable() == null - && message.getEncryption() != Message.ENCRYPTION_PGP) { + && message.getEncryption() != Message.ENCRYPTION_PGP + && message.getFileParams().height > 0) { return message; } } |