Merge pull request #930 from betheg/otr

Daniel Gultsch created 11 years ago

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

Change summary

src/main/java/eu/siacs/conversations/parser/MessageParser.java    | 2 +
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java | 1 
2 files changed, 3 insertions(+)

Detailed changes

src/main/java/eu/siacs/conversations/parser/MessageParser.java

@@ -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();
 			}

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java

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