aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-01-25 01:07:09 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-01-25 01:07:09 +0100
commit90d06d38d6a405b88d768703a52e1fa18cadfbd3 (patch)
treefc6a86161526e469ab41127d4123665dcfa97eb2 /src/main/java/eu/siacs/conversations
parent7769d305e6853442914b5c0a82b0e8184e90a6ca (diff)
parent8041d23cb16c9c032bd9e0a8008be543520d6353 (diff)
Merge pull request #927 from betheg/otr_query_message
MessageParser: fix the regex for otr query messages.
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
-rw-r--r--src/main/java/eu/siacs/conversations/parser/MessageParser.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 4d102c3a..bfe081cd 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -75,7 +75,7 @@ public class MessageParser extends AbstractParser implements
}
updateLastseen(packet, account, true);
String body = packet.getBody();
- if (body.matches("^\\?OTRv\\d*\\?")) {
+ if (body.matches("^\\?OTRv\\d{1,2}\\?.*")) {
conversation.endOtrIfNeeded();
}
if (!conversation.hasValidOtrSession()) {