From ea261c1032eae6c17244da029e1c491ade51e1e1 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Tue, 24 Jun 2014 16:14:18 +0200 Subject: more otr fixes --- src/eu/siacs/conversations/generator/MessageGenerator.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'src/eu/siacs/conversations/generator') diff --git a/src/eu/siacs/conversations/generator/MessageGenerator.java b/src/eu/siacs/conversations/generator/MessageGenerator.java index 77ac55f15..b97289522 100644 --- a/src/eu/siacs/conversations/generator/MessageGenerator.java +++ b/src/eu/siacs/conversations/generator/MessageGenerator.java @@ -46,17 +46,21 @@ public class MessageGenerator { return generateOtrChat(message, false); } - public MessagePacket generateOtrChat(Message message, boolean addDelay) throws OtrException { + public MessagePacket generateOtrChat(Message message, boolean addDelay) { Session otrSession = message.getConversation().getOtrSession(); if (otrSession==null) { - throw new OtrException(null); + return null; } MessagePacket packet = preparePacket(message,addDelay); packet.addChild("private", "urn:xmpp:carbons:2"); packet.addChild("no-copy", "urn:xmpp:hints"); - packet.setBody(otrSession.transformSending(message - .getBody())); - return packet; + try { + packet.setBody(otrSession.transformSending(message + .getBody())); + return packet; + } catch (OtrException e) { + return null; + } } public MessagePacket generateChat(Message message) { -- cgit v1.2.3