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

bugfix: don't crash if aes key could not be set before jingle transfer

Browse Source
This commit is contained in:
Daniel Gultsch 2015-07-19 14:51:04 +02:00
parent 5c017e5186
commit 9b70c7e68c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
View File

@ -368,7 +368,10 @@ public class JingleConnection implements Transferable {
message, false); message, false);
if (message.getEncryption() == Message.ENCRYPTION_OTR) { if (message.getEncryption() == Message.ENCRYPTION_OTR) {
Conversation conversation = this.message.getConversation(); Conversation conversation = this.message.getConversation();
this.mXmppConnectionService.renewSymmetricKey(conversation); if (!this.mXmppConnectionService.renewSymmetricKey(conversation)) {
Log.d(Config.LOGTAG,account.getJid().toBareJid()+": could not set symmetric key");
cancel();
}
content.setFileOffer(this.file, true); content.setFileOffer(this.file, true);
this.file.setKey(conversation.getSymmetricKey()); this.file.setKey(conversation.getSymmetricKey());
} else { } else {