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

Merge pull request #930 from betheg/otr

Browse source 
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); body = otrSession.transformReceiving(body);
SessionStatus after = otrSession.getSessionStatus(); SessionStatus after = otrSession.getSessionStatus();
if ((before != after) && (after == SessionStatus.ENCRYPTED)) { if ((before != after) && (after == SessionStatus.ENCRYPTED)) {
conversation.setNextEncryption(Message.ENCRYPTION_OTR);
mXmppConnectionService.onOtrSessionEstablished(conversation); mXmppConnectionService.onOtrSessionEstablished(conversation);
} else if ((before != after) && (after == SessionStatus.FINISHED)) { } else if ((before != after) && (after == SessionStatus.FINISHED)) {
conversation.setNextEncryption(Message.ENCRYPTION_NONE);
conversation.resetOtrSession(); conversation.resetOtrSession();
mXmppConnectionService.updateConversationUi(); mXmppConnectionService.updateConversationUi();
} }

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

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