diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-11-25 20:47:02 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-11-25 20:47:02 +0100 |
| commit | a557d38e4d0bd55442012f7f8a5be62532f7bfe9 (patch) | |
| tree | da3b244cb71952cd469ff0276295b25fd0c6f729 /src/main/java/eu/siacs/conversations/http | |
| parent | 8228e82f51fee33d28a81e4b0c36f7c51122035c (diff) | |
pgp fixes and revert configuration changes
Diffstat (limited to 'src/main/java/eu/siacs/conversations/http')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java index 792a71e8..96dee62c 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java @@ -125,6 +125,9 @@ public class HttpDownloadConnection implements Transferable { mXmppConnectionService.sendBroadcast(intent); message.setTransferable(null); mHttpConnectionManager.finishConnection(this); + if (message.getEncryption() == Message.ENCRYPTION_PGP) { + message.getConversation().getAccount().getPgpDecryptionService().add(message); + } mXmppConnectionService.updateConversationUi(); if (acceptedAutomatically) { mXmppConnectionService.getNotificationService().push(message); |