From 389d4db311f22ceb787976a6c6130bb0260610bb Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel.gultsch@rwth-aachen.de>
Date: Wed, 19 Mar 2014 15:05:01 +0100
Subject: rename in muc fixed

---
 src/eu/siacs/conversations/utils/MessageParser.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/eu/siacs/conversations/utils/MessageParser.java')

diff --git a/src/eu/siacs/conversations/utils/MessageParser.java b/src/eu/siacs/conversations/utils/MessageParser.java
index 4abd781e..d6f86900 100644
--- a/src/eu/siacs/conversations/utils/MessageParser.java
+++ b/src/eu/siacs/conversations/utils/MessageParser.java
@@ -40,11 +40,7 @@ public class MessageParser {
 			String foreignPresence = conversation.getOtrSession().getSessionID().getUserID();
 			if (!foreignPresence.equals(fromParts[1])) {
 				Log.d(LOGTAG,"new otr during existing otr session requested. ending old one");
-				try {
-					conversation.getOtrSession().endSession();
-				} catch (OtrException e) {
-					Log.d("xmppService","couldnt end old session");
-				}
+				conversation.resetOtrSession();
 				Log.d("xmppService","starting new one with "+fromParts[1]);
 				conversation.startOtrSession(service.getApplicationContext(), fromParts[1]);
 			}
@@ -80,7 +76,6 @@ public class MessageParser {
 				Log.d(LOGTAG,"otr session stoped");
 			}
 		} catch (Exception e) {
-			Log.d(LOGTAG, "error receiving otr. resetting");
 			conversation.resetOtrSession();
 			return null;
 		}
-- 
cgit v1.2.3