aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-08-21 07:39:14 +0200
committeriNPUTmice <daniel@gultsch.de>2014-08-21 07:39:14 +0200
commit9f4043c67937d20d5b1ae5510c1c0c76d45629e7 (patch)
treed3ca4eab800bcbe53a0815a964d989c26c602cd6 /src
parentbd467b6b9da3d79c5eae1093481351f849dd01a2 (diff)
avoid race condition for otr key in jingle
Diffstat (limited to 'src')
-rw-r--r--src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java2
1 files changed, 1 insertions, 1 deletions
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);