aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-10-05 11:14:50 +0200
committeriNPUTmice <daniel@gultsch.de>2014-10-05 11:14:50 +0200
commit26ce62f3656f6660bf8a9a5f07f7da4a8d8c5b5e (patch)
tree56969d88129bc7427d4e04d495bb130e7865a8a9 /src/eu/siacs/conversations
parent45bd0449fb7f9fa8d09b2556a6cb2c8ff3c79d1e (diff)
end otr session instead of only resetting
Diffstat (limited to 'src/eu/siacs/conversations')
-rw-r--r--src/eu/siacs/conversations/parser/MessageParser.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java
index e09dd0c5b..187526590 100644
--- a/src/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/eu/siacs/conversations/parser/MessageParser.java
@@ -73,7 +73,7 @@ public class MessageParser extends AbstractParser implements
updateLastseen(packet, account, true);
String body = packet.getBody();
if (body.matches("^\\?OTRv\\d*\\?")) {
- conversation.resetOtrSession();
+ conversation.endOtrIfNeeded();
}
if (!conversation.hasValidOtrSession()) {
if (properlyAddressed) {