From a557d38e4d0bd55442012f7f8a5be62532f7bfe9 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Wed, 25 Nov 2015 20:47:02 +0100
Subject: pgp fixes and revert configuration changes

---
 src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java')

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);
-- 
cgit v1.2.3