narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

don't close otr session on every presence change

Browse source
This commit is contained in:
Daniel Gultsch 2016-08-13 12:43:06 +02:00
parent 94aee445e7
commit 343bb7ff28
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View file

@ -193,15 +193,12 @@ public class XmppConnectionService extends Service {
sendUnsentMessages(conversation);
}
} else {
if (contact.getPresences().size() >= 1) {
if (conversation.hasValidOtrSession()) {
String otrResource = conversation.getOtrSession().getSessionID().getUserID();
if (!(Arrays.asList(contact.getPresences().toResourceArray()).contains(otrResource))) {
conversation.endOtrIfNeeded();
}
//check if the resource we are haveing a conversation with is still online
if (conversation.hasValidOtrSession()) {
String otrResource = conversation.getOtrSession().getSessionID().getUserID();
if (!(Arrays.asList(contact.getPresences().toResourceArray()).contains(otrResource))) {
conversation.endOtrIfNeeded();
}
} else {
conversation.endOtrIfNeeded();
}
}
}