From 9f4043c67937d20d5b1ae5510c1c0c76d45629e7 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Thu, 21 Aug 2014 07:39:14 +0200 Subject: avoid race condition for otr key in jingle --- src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/eu/siacs') diff --git a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java index 44d6b9f0..1f1dfb21 100644 --- a/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java +++ b/src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java @@ -328,7 +328,7 @@ public class JingleConnection { this.cancel(); return; } else { - this.file.setKey(conversation.getSymmetricKey()); + this.file.setKey(key); } } this.file.setExpectedSize(size); -- cgit v1.2.3