From ecb4615f2a8c5258097d2d27d10d49625eb5a4ec Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Thu, 26 Nov 2015 06:52:46 +0100 Subject: [PATCH] fail jingle file transfer if axolotl key message could not be created. fixes #1576 --- .../siacs/conversations/xmpp/jingle/JingleConnection.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 4510bca26..59b660c8c 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java @@ -221,7 +221,11 @@ public class JingleConnection implements Transferable { conversation.getAccount().getAxolotlService().prepareKeyTransportMessage(conversation.getContact(), new OnMessageCreatedCallback() { @Override public void run(XmppAxolotlMessage xmppAxolotlMessage) { - init(message, xmppAxolotlMessage); + if (xmppAxolotlMessage != null) { + init(message, xmppAxolotlMessage); + } else { + fail(); + } } }); } else {