From 3e748bc49a25c2700e6929286f7041e9c571d7f3 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 13 Jun 2016 13:32:14 +0200
Subject: refactored pgp decryption

---
 src/main/java/eu/siacs/conversations/parser/MessageParser.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/parser')

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 2883b9a5c..86f96c370 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -7,7 +7,6 @@ import android.util.Pair;
 import net.java.otr4j.session.Session;
 import net.java.otr4j.session.SessionStatus;
 
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,7 +31,6 @@ import eu.siacs.conversations.http.HttpConnectionManager;
 import eu.siacs.conversations.services.MessageArchiveService;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.utils.CryptoHelper;
-import eu.siacs.conversations.utils.Xmlns;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.OnMessagePacketReceived;
 import eu.siacs.conversations.xmpp.chatstate.ChatState;
@@ -484,7 +482,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 							sendMessageReceipts(account, packet);
 						}
 						if (replacedMessage.getEncryption() == Message.ENCRYPTION_PGP) {
-							conversation.getAccount().getPgpDecryptionService().add(replacedMessage);
+							conversation.getAccount().getPgpDecryptionService().decrypt(replacedMessage);
 						}
 						return;
 					} else {
@@ -508,7 +506,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
 			}
 
 			if (message.getEncryption() == Message.ENCRYPTION_PGP) {
-				conversation.getAccount().getPgpDecryptionService().add(message);
+				conversation.getAccount().getPgpDecryptionService().decrypt(message);
 			}
 
 			if (query == null || query.getWith() == null) { //either no mam or catchup
-- 
cgit v1.2.3