narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 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 37cbdb8b4e
commit 5c2720efd0
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 {