sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed npe in error message handling

This commit is contained in:
Daniel Gultsch 2015-07-21 19:44:25 +02:00
parent 0d679a7abb
commit f6281a182d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View File

@ -206,7 +206,7 @@ public class MessageParser extends AbstractParser implements
from.toBareJid(), from.toBareJid(),
packet.getId(), packet.getId(),
Message.STATUS_SEND_FAILED); Message.STATUS_SEND_FAILED);
if (message.getEncryption() == Message.ENCRYPTION_OTR) { if (message != null && message.getEncryption() == Message.ENCRYPTION_OTR) {
message.getConversation().endOtrIfNeeded(); message.getConversation().endOtrIfNeeded();
} }
} }