From 69ef17efc054c9f3b7b3b5a26f419e6b920ffd13 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Sun, 9 Nov 2014 17:46:00 +0100 Subject: migrated some otr stuff to new jid classes --- .../conversations/services/XmppConnectionService.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java') diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index b0fccaec..787cacd0 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -585,19 +585,21 @@ public class XmppConnectionService extends Service { if (!conv.hasValidOtrSession()&& (message.getCounterpart() != null)) { conv.startOtrSession(this, message.getCounterpart().getResourcepart(), true); message.setStatus(Message.STATUS_WAITING); - } else if (conv.hasValidOtrSession() - && conv.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED) { + } else if (conv.hasValidOtrSession()) { SessionID id = conv.getOtrSession().getSessionID(); try { message.setCounterpart(Jid.fromString(id.getAccountID() + "/" + id.getUserID())); } catch (final InvalidJidException e) { message.setCounterpart(null); } - packet = mMessageGenerator.generateOtrChat(message); - send = true; - - } else if (message.getCounterpart() == null) { - conv.startOtrIfNeeded(); + if (conv.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED) { + packet = mMessageGenerator.generateOtrChat(message); + send = true; + } else { + message.setStatus(Message.STATUS_WAITING); + conv.startOtrIfNeeded(); + } + } else { message.setStatus(Message.STATUS_WAITING); } } else if (message.getEncryption() == Message.ENCRYPTION_DECRYPTED) { -- cgit v1.2.3