aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-07-19 14:51:04 +0200
committerDaniel Gultsch <daniel@gultsch.de>2015-07-19 14:51:04 +0200
commit9b70c7e68ccf3b1efdaff782f14b0549415f1339 (patch)
tree52995a5b7d30be00e03805fde35bac700b69a4f5 /src/main
parent5c017e5186d9359bbfca0a05dcac8ed22516800d (diff)
bugfix: don't crash if aes key could not be set before jingle transfer
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java5
1 files changed, 4 insertions, 1 deletions
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 3c355b57..65cafe79 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 {