diff options
| author | Christian S <christian@pix-art.de> | 2015-08-02 08:54:53 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-08-02 08:54:53 +0200 |
| commit | 2d1abca3022b0fe41fd4df72a85f5d1514e61ad8 (patch) | |
| tree | a20929afe26d27c6773b17af705967042e0c9678 /src/main/java/eu/siacs/conversations/services/NotificationService.java | |
| parent | e42dc661c217724ccb8ab0d71c5c337eee64464d (diff) | |
| parent | 6c69e17eef5d4c436fc40b50b211fab8ccfef9f2 (diff) | |
copy commits
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/NotificationService.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 b99069a64..7dcf2e83a 100644 --- a/src/main/java/eu/siacs/conversations/services/NotificationService.java +++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java @@ -330,9 +330,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; } } |