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

bugfix: changed condition of onOtrSessionEstablished being called

Browse source 
fixed #1263
fixed #1260
fixed #1293
This commit is contained in:
Daniel Gultsch 2015-07-21 11:46:51 +02:00
parent 96f38324f8
commit f1ee5cccf0
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View file

@ -66,18 +66,18 @@ public class MessageParser extends AbstractParser implements
try { try {
conversation.setLastReceivedOtrMessageId(id); conversation.setLastReceivedOtrMessageId(id);
Session otrSession = conversation.getOtrSession(); Session otrSession = conversation.getOtrSession();
SessionStatus before = otrSession.getSessionStatus();
body = otrSession.transformReceiving(body); body = otrSession.transformReceiving(body);
SessionStatus after = otrSession.getSessionStatus(); SessionStatus status = otrSession.getSessionStatus();
if ((before != after) && (after == SessionStatus.ENCRYPTED)) { if (body == null && status == SessionStatus.ENCRYPTED) {
conversation.setNextEncryption(Message.ENCRYPTION_OTR); conversation.setNextEncryption(Message.ENCRYPTION_OTR);
mXmppConnectionService.onOtrSessionEstablished(conversation); mXmppConnectionService.onOtrSessionEstablished(conversation);
} else if ((before != after) && (after == SessionStatus.FINISHED)) { return null;
} else if (body == null && status == SessionStatus.FINISHED) {
conversation.setNextEncryption(Message.ENCRYPTION_NONE); conversation.setNextEncryption(Message.ENCRYPTION_NONE);
conversation.resetOtrSession(); conversation.resetOtrSession();
mXmppConnectionService.updateConversationUi(); mXmppConnectionService.updateConversationUi();
} return null;
if ((body == null) || (body.isEmpty())) { } else if (body == null || (body.isEmpty())) {
return null; return null;
} }
if (body.startsWith(CryptoHelper.FILETRANSFER)) { if (body.startsWith(CryptoHelper.FILETRANSFER)) {