narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

JingleConnection: fixed rare npe when canceling jingle

Browse source
This commit is contained in:
Daniel Gultsch 2017-11-16 12:49:15 +01:00
parent c52492ada0
commit 2d42646893
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
View file

@ -100,7 +100,7 @@ public class JingleConnection implements Transferable {
private byte[] expectedHash = new byte[0]; private byte[] expectedHash = new byte[0];
private boolean responding() { private boolean responding() {
return responder.equals(account.getJid()); return responder != null && responder.equals(account.getJid());
} }
private boolean initiating() { private boolean initiating() {
@ -914,8 +914,7 @@ public class JingleConnection implements Transferable {
} }
this.mJingleConnectionManager.updateConversationUi(true); this.mJingleConnectionManager.updateConversationUi(true);
} else { } else {
this.mXmppConnectionService.markMessage(this.message, this.mXmppConnectionService.markMessage(this.message, Message.STATUS_SEND_FAILED);
Message.STATUS_SEND_FAILED);
this.message.setTransferable(null); this.message.setTransferable(null);
} }
} }