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

otr: switch to the otr-state the partner alternate.

Browse Source 
should also fixed #877
This commit is contained in:
Michael 2015-01-25 13:07:31 +01:00
parent 90d06d38d6
commit 7800647885
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();
} }
} }