made otr a little bit more solid when there is no presence subscription

1 files changed, 6 insertions, 3 deletions

diff --git a/src/eu/siacs/conversations/parser/MessageParser.java b/src/eu/siacs/conversations/parser/MessageParser.java
index 0f95627d3..938ccc167 100644
--- a/src/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/eu/siacs/conversations/parser/MessageParser.java
@@ -71,10 +71,13 @@ public class MessageParser extends AbstractParser implements
 		}
 		updateLastseen(packet, account, true);
 		String body = packet.getBody();
+		if (body.matches("^\\?OTRv\\d*\\?")) {
+			conversation.resetOtrSession();
+		}
 		if (!conversation.hasValidOtrSession()) {
 			if (properlyAddressed) {
 				conversation.startOtrSession(
-						mXmppConnectionService.getApplicationContext(),
+						mXmppConnectionService,
 						presence, false);
 			} else {
 				return null;
@@ -86,7 +89,7 @@ public class MessageParser extends AbstractParser implements
 				conversation.endOtrIfNeeded();
 				if (properlyAddressed) {
 					conversation.startOtrSession(
-							mXmppConnectionService.getApplicationContext(),
+							mXmppConnectionService,
 							presence, false);
 				} else {
 					return null;
@@ -125,7 +128,7 @@ public class MessageParser extends AbstractParser implements
 			if (receivedId != null) {
 				mXmppConnectionService.replyWithNotAcceptable(account, packet);
 			}
-			conversation.endOtrIfNeeded();
+			conversation.resetOtrSession();
 			return null;
 		}
 	}