aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/parser/MessageParser.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-06-26 16:42:24 +0200
committeriNPUTmice <daniel@gultsch.de>2014-06-26 16:42:24 +0200
commit3a57f6df897202010e1de242445b0f65763946d2 (patch)
treed39f982311baeee07b2216285b71e5b2c46999f3 /src/eu/siacs/conversations/parser/MessageParser.java
parent3bb585c020f6b21e41de7ce6d8ee9cb0675a9b54 (diff)
faulty otr messages now generate an error
Diffstat (limited to 'src/eu/siacs/conversations/parser/MessageParser.java')
-rw-r--r--src/eu/siacs/conversations/parser/MessageParser.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java
index cd10d6c8..598cf830 100644
--- a/src/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/eu/siacs/conversations/parser/MessageParser.java
@@ -92,9 +92,9 @@ public class MessageParser extends AbstractParser {
} catch (Exception e) {
String receivedId = packet.getId();
if (receivedId!=null) {
- mXmppConnectionService.replyWithError(account,packet);
+ mXmppConnectionService.replyWithNotAcceptable(account,packet);
}
- conversation.resetOtrSession();
+ conversation.endOtrIfNeeded();
return null;
}
}