diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-10-22 19:05:15 +0200 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-10-22 19:05:15 +0200 |
| commit | d04afe453a277dfe7d7018c55068d2b4fed6c387 (patch) | |
| tree | eb7b2944ec615e0b3b07b3260e420e5cd00eebc9 /src/eu/siacs/conversations/ui/ConversationFragment.java | |
| parent | c067bf96b032e1bef3b021df246dadccbb1b5fd7 (diff) | |
ability to download pgp encrypted files over http as well
Diffstat (limited to '')
| -rw-r--r-- | src/eu/siacs/conversations/ui/ConversationFragment.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java index 0e71801bd..580fa2d22 100644 --- a/src/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/eu/siacs/conversations/ui/ConversationFragment.java @@ -435,9 +435,9 @@ public class ConversationFragment extends Fragment { }); } for (Message message : this.conversation.getMessages()) { - if ((message.getEncryption() == Message.ENCRYPTION_PGP) - && ((message.getStatus() == Message.STATUS_RECEIVED) || (message - .getStatus() == Message.STATUS_SEND))) { + if (message.getEncryption() == Message.ENCRYPTION_PGP + && (message.getStatus() == Message.STATUS_RECEIVED || message + .getStatus() >= Message.STATUS_SEND) && message.getDownloadable() == null) { if (!mEncryptedMessages.contains(message)) { mEncryptedMessages.add(message); } |