aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/utils/MessageParser.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-03-19 15:05:01 +0100
committerDaniel Gultsch <daniel.gultsch@rwth-aachen.de>2014-03-19 15:05:01 +0100
commit389d4db311f22ceb787976a6c6130bb0260610bb (patch)
tree47d75d3086256806430ffabd5be3e2181d634779 /src/eu/siacs/conversations/utils/MessageParser.java
parent3a98a695d4c77cf879a76262b2d370d79e8b4fdb (diff)
rename in muc fixed
Diffstat (limited to 'src/eu/siacs/conversations/utils/MessageParser.java')
-rw-r--r--src/eu/siacs/conversations/utils/MessageParser.java7
1 files changed, 1 insertions, 6 deletions
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;
}