fixed npe in error message handling

This commit is contained in:
Daniel Gultsch 2015-07-21 19:44:25 +02:00
parent 31cb742bbf
commit d38228f482

View file

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