diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-11-09 17:46:00 +0100 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-11-09 17:46:00 +0100 |
commit | 69ef17efc054c9f3b7b3b5a26f419e6b920ffd13 (patch) | |
tree | 5d4830e6c0ebb6250f9b39c45819e34bfb2e8570 /src/main/java/eu/siacs/conversations/services | |
parent | c310ada8b3b2cce0195f3a2056234c3082106d25 (diff) |
migrated some otr stuff to new jid classes
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services')
-rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index b0fccaecf..787cacd0a 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) { |