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

Merge pull request #930 from betheg/otr 

otr: switch to the otr-state the partner alternate.
This commit is contained in:
Daniel Gultsch 2015-01-25 20:53:29 +01:00
parent 1559144701 7800647885
commit 4afdd6480a
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View File

@ -102,8 +102,10 @@ public class MessageParser extends AbstractParser implements
body = otrSession.transformReceiving(body);
SessionStatus after = otrSession.getSessionStatus();
if ((before != after) && (after == SessionStatus.ENCRYPTED)) {
conversation.setNextEncryption(Message.ENCRYPTION_OTR);
mXmppConnectionService.onOtrSessionEstablished(conversation);
} else if ((before != after) && (after == SessionStatus.FINISHED)) {
conversation.setNextEncryption(Message.ENCRYPTION_NONE);
conversation.resetOtrSession();
mXmppConnectionService.updateConversationUi();
}

1
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -298,6 +298,7 @@ public class ConversationFragment extends Fragment {
default:
break;
}
getActivity().invalidateOptionsMenu();
}
}