JingleConnection: fixed rare npe when canceling jingle

1 files 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);
         }
     }