diff options
| author | Michael <betheg@bitcloner.org> | 2015-01-25 13:07:31 +0100 |
|---|---|---|
| committer | Michael <betheg@bitcloner.org> | 2015-01-25 13:07:31 +0100 |
| commit | 78006478858fe074ecea4224063c0e6fc156ce4e (patch) | |
| tree | 349af34b076c9d150849f41d5f1169a6938f4348 /src/main/java/eu/siacs/conversations/parser/MessageParser.java | |
| parent | 90d06d38d6a405b88d768703a52e1fa18cadfbd3 (diff) | |
otr: switch to the otr-state the partner alternate.
should also fixed #877
Diffstat (limited to 'src/main/java/eu/siacs/conversations/parser/MessageParser.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/parser/MessageParser.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java index bfe081cd..0f56f734 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java @@ -102,8 +102,10 @@ public class MessageParser extends AbstractParser implements body = otrSession.transformReceiving(body); SessionStatus after = otrSession.getSessionStatus(); if ((before != after) && (after == SessionStatus.ENCRYPTED)) { + conversation.setNextEncryption(Message.ENCRYPTION_OTR); mXmppConnectionService.onOtrSessionEstablished(conversation); } else if ((before != after) && (after == SessionStatus.FINISHED)) { + conversation.setNextEncryption(Message.ENCRYPTION_NONE); conversation.resetOtrSession(); mXmppConnectionService.updateConversationUi(); } |