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

Merge pull request #664 from squidpickles/development

Browse source 
Added check for empty from on group chat packet
This commit is contained in:
Daniel Gultsch 2014-11-14 21:01:21 +01:00
parent 793671023b 2bb68bcbba
commit c61120bfc4
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View file

@ -133,6 +133,9 @@ public class MessageParser extends AbstractParser implements
private Message parseGroupchat(MessagePacket packet, Account account) { private Message parseGroupchat(MessagePacket packet, Account account) {
int status; int status;
final Jid from = packet.getFrom(); final Jid from = packet.getFrom();
if (from == null) {
return null;
}
if (mXmppConnectionService.find(account.pendingConferenceLeaves, if (mXmppConnectionService.find(account.pendingConferenceLeaves,
account, from.toBareJid()) != null) { account, from.toBareJid()) != null) {
return null; return null;