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

Don't crash on packets with no "from" specified

Browse source
This commit is contained in:
Sam Whited 2014-11-07 22:36:30 -05:00
parent 1a3327f2b1
commit cc34c60255
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,8 @@ public class PresenceParser extends AbstractParser implements
public void parseConferencePresence(PresencePacket packet, Account account) { public void parseConferencePresence(PresencePacket packet, Account account) {
PgpEngine mPgpEngine = mXmppConnectionService.getPgpEngine(); PgpEngine mPgpEngine = mXmppConnectionService.getPgpEngine();
if (packet.hasChild("x", "http://jabber.org/protocol/muc#user")) { if (packet.hasChild("x", "http://jabber.org/protocol/muc#user")) {
final Conversation muc = mXmppConnectionService.find(account, final Conversation muc = packet.getFrom() == null ? null : mXmppConnectionService.find(
account,
packet.getFrom().toBareJid()); packet.getFrom().toBareJid());
if (muc != null) { if (muc != null) {
boolean before = muc.getMucOptions().online(); boolean before = muc.getMucOptions().online();