diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-07-21 19:44:25 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-07-21 19:45:41 +0200 |
| commit | d38228f4829fe427b315e1f5c6be47542729549b (patch) | |
| tree | 0af9b5e95f69434a87300e6a76bfd9397035c9ed /src | |
| parent | 31cb742bbf694b6939ad365fb64b1516875764e0 (diff) | |
fixed npe in error message handling
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/parser/MessageParser.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java index 94073f8a..2d722af7 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java @@ -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(); } } |