moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-28 11:42:15 -05:00
Code Issues Releases 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
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;