sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed otr bug

This commit is contained in:
Daniel Gultsch 2014-03-08 00:48:52 +01:00
parent 5955da3519
commit a1b72313d7
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/eu/siacs/conversations/utils/MessageParser.java
View File

@ -2,6 +2,7 @@ package eu.siacs.conversations.utils;
import java.util.List; import java.util.List;
import net.java.otr4j.OtrException;
import net.java.otr4j.session.Session; import net.java.otr4j.session.Session;
import net.java.otr4j.session.SessionStatus; import net.java.otr4j.session.SessionStatus;
import android.util.Log; import android.util.Log;
@ -35,6 +36,17 @@ public class MessageParser {
String body = packet.getBody(); String body = packet.getBody();
if (!conversation.hasValidOtrSession()) { if (!conversation.hasValidOtrSession()) {
conversation.startOtrSession(service.getApplicationContext(), fromParts[1]); conversation.startOtrSession(service.getApplicationContext(), fromParts[1]);
} else {
if (body.startsWith("?OTRv")) {
Log.d("xmppService","new otr during existing otr session requested. ending old one");
try {
conversation.getOtrSession().endSession();
} catch (OtrException e) {
Log.d("xmppService","couldnt end old session");
}
Log.d("xmppService","starting new one with "+fromParts[1]);
conversation.startOtrSession(service.getApplicationContext(), fromParts[1]);
}
} }
try { try {
Session otrSession = conversation.getOtrSession(); Session otrSession = conversation.getOtrSession();