From e388c64361a3dad44442dd1f8633e452302188e8 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Mon, 25 Jul 2016 14:15:47 +0200 Subject: refactored how view intents are handled processing view intents before saved instance caused troubles when the activity was destroyed fixes #1969 --- src/main/java/eu/siacs/conversations/entities/Conversation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/eu/siacs/conversations/entities/Conversation.java') diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index c3294f774..ee47f87a0 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -158,9 +158,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl public Message findMessageWithFileAndUuid(final String uuid) { synchronized (this.messages) { for (final Message message : this.messages) { - if ((message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE) + if (message.getUuid().equals(uuid) && message.getEncryption() != Message.ENCRYPTION_PGP - && message.getUuid().equals(uuid)) { + && (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE || message.treatAsDownloadable() != Message.Decision.NEVER)) { return message; } } -- cgit v1.2.3