diff options
author | iNPUTmice <daniel@gultsch.de> | 2015-01-16 16:10:27 +0100 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2015-01-16 16:10:27 +0100 |
commit | be169215caa26bce5cf707ea7ce8db79da21f8e1 (patch) | |
tree | ee5daa3c0fda31e0fdb9d31c29f8bc86a781930e /src/main/java/eu/siacs/conversations/entities | |
parent | dc8b467cf63af3466e13f58c8abc63875a44754e (diff) | |
parent | edd58f19b46340f3c9e2182441c9f749754cfa5c (diff) |
Merge branch 'SamWhited-download-button-notification' into development
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Conversation.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index 470bd290..036acf63 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -108,9 +108,9 @@ public class Conversation extends AbstractEntity implements Blockable { } } - public void findMessagesWithFiles(OnMessageFound onMessageFound) { + public void findMessagesWithFiles(final OnMessageFound onMessageFound) { synchronized (this.messages) { - for (Message message : this.messages) { + for (final Message message : this.messages) { if ((message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE) && message.getEncryption() != Message.ENCRYPTION_PGP) { onMessageFound.onMessageFound(message); @@ -119,14 +119,14 @@ public class Conversation extends AbstractEntity implements Blockable { } } - public Message findMessageWithFileAndUuid(String uuid) { + public Message findMessageWithFileAndUuid(final String uuid) { synchronized (this.messages) { - for (Message message : this.messages) { - if (message.getType() == Message.TYPE_IMAGE + for (final Message message : this.messages) { + if ((message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE) && message.getEncryption() != Message.ENCRYPTION_PGP && message.getUuid().equals(uuid)) { return message; - } + } } } return null; |