aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-11-26 06:52:46 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-11-26 06:52:46 +0100
commitecb4615f2a8c5258097d2d27d10d49625eb5a4ec (patch)
tree1858d7127736418e681d766197aa64378c2cc194 /src/main/java/eu/siacs/conversations/xmpp
parenta557d38e4d0bd55442012f7f8a5be62532f7bfe9 (diff)
fail jingle file transfer if axolotl key message could not be created. fixes #1576
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp')
-rw-r--r--src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java6
1 files changed, 5 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 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 {