moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-12-01 05:02:21 -05:00
Code Issues Releases Wiki Activity

end otr session if plain text message from another instance is being received

Browse Source
This commit is contained in:
iNPUTmice 2014-10-28 18:02:12 +01:00
parent f256a466d8
commit 962e8183f6
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/eu/siacs/conversations/parser/MessageParser.java
View File

@ -256,7 +256,6 @@ public class MessageParser extends AbstractParser implements
return null; return null;
} }
} }
return finishedMessage; return finishedMessage;
} }
@ -478,6 +477,14 @@ public class MessageParser extends AbstractParser implements
} }
Conversation conversation = message.getConversation(); Conversation conversation = message.getConversation();
conversation.add(message); conversation.add(message);
if (message.getStatus() == Message.STATUS_RECEIVED
&& conversation.getOtrSession() != null
&& !conversation.getOtrSession().getSessionID().getUserID()
.equals(message.getPresence())) {
conversation.endOtrIfNeeded();
}
if (packet.getType() != MessagePacket.TYPE_ERROR) { if (packet.getType() != MessagePacket.TYPE_ERROR) {
if (message.getEncryption() == Message.ENCRYPTION_NONE if (message.getEncryption() == Message.ENCRYPTION_NONE
|| mXmppConnectionService.saveEncryptedMessages()) { || mXmppConnectionService.saveEncryptedMessages()) {