From 18310e63a7ef95426100d7498621afe8cb0a2348 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Tue, 21 Nov 2017 20:55:45 +0100 Subject: JingleConnection: fixed rare npe when canceling jingle --- src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java index 54e9bd205..1da6c6d5b 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java @@ -147,7 +147,7 @@ public class JingleConnection implements Transferable { }; private boolean responding() { - return responder.equals(account.getJid()); + return responder != null && responder.equals(account.getJid()); } private boolean initiating() { @@ -914,8 +914,7 @@ public class JingleConnection implements Transferable { } this.mJingleConnectionManager.updateConversationUi(true); } else { - this.mXmppConnectionService.markMessage(this.message, - Message.STATUS_SEND_FAILED); + this.mXmppConnectionService.markMessage(this.message, Message.STATUS_SEND_FAILED); this.message.setTransferable(null); } } -- cgit v1.2.3