moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-28 11:42:15 -05:00
Code Issues Releases Wiki Activity

only end otr session if there is more than one contact presence. reset otherwise

Browse Source
This commit is contained in:
iNPUTmice 2014-10-30 10:59:41 +01:00
parent e4567e7a62
commit 7b4f3637db
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -127,7 +127,11 @@ public class XmppConnectionService extends Service {
public void onContactStatusChanged(Contact contact, boolean online) { public void onContactStatusChanged(Contact contact, boolean online) {
Conversation conversation = find(getConversations(), contact); Conversation conversation = find(getConversations(), contact);
if (conversation != null) { if (conversation != null) {
conversation.endOtrIfNeeded(); if (online && contact.getPresences().size() > 1) {
conversation.endOtrIfNeeded();
} else {
conversation.resetOtrSession();
}
if (online && (contact.getPresences().size() == 1)) { if (online && (contact.getPresences().size() == 1)) {
sendUnsendMessages(conversation); sendUnsendMessages(conversation);
} }