From 9b70c7e68ccf3b1efdaff782f14b0549415f1339 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 19 Jul 2015 14:51:04 +0200
Subject: bugfix: don't crash if aes key could not be set before jingle
 transfer

---
 .../java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index 3c355b577..65cafe791 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -368,7 +368,10 @@ public class JingleConnection implements Transferable {
 					message, false);
 			if (message.getEncryption() == Message.ENCRYPTION_OTR) {
 				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);
 				this.file.setKey(conversation.getSymmetricKey());
 			} else {
-- 
cgit v1.2.3