aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2017-11-21 20:55:45 +0100
committerChristian Schneppe <christian@pix-art.de>2017-11-21 20:55:45 +0100
commit18310e63a7ef95426100d7498621afe8cb0a2348 (patch)
tree20e20da40abb3cf145a0020869268f2f5b209e07 /src/main
parentbfc43c8a897f239b734b8c7cfd15b783aeee9b83 (diff)
JingleConnection: fixed rare npe when canceling jingle
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java5
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);
}
}