sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed very rare npe

This commit is contained in:
iNPUTmice 2014-08-09 11:35:49 +02:00
parent 937fc51b50
commit a059dfab2c
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/eu/siacs/conversations/parser/IqParser.java
View File

@ -27,14 +27,16 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
if (!contact.getOption(Contact.Options.DIRTY_PUSH)) { if (!contact.getOption(Contact.Options.DIRTY_PUSH)) {
contact.setServerName(name); contact.setServerName(name);
} }
if (subscription.equals("remove")) { if (subscription!=null) {
contact.resetOption(Contact.Options.IN_ROSTER); if (subscription.equals("remove")) {
contact.resetOption(Contact.Options.DIRTY_DELETE); contact.resetOption(Contact.Options.IN_ROSTER);
contact.resetOption(Contact.Options.PREEMPTIVE_GRANT); contact.resetOption(Contact.Options.DIRTY_DELETE);
} else { contact.resetOption(Contact.Options.PREEMPTIVE_GRANT);
contact.setOption(Contact.Options.IN_ROSTER); } else {
contact.resetOption(Contact.Options.DIRTY_PUSH); contact.setOption(Contact.Options.IN_ROSTER);
contact.parseSubscriptionFromElement(item); contact.resetOption(Contact.Options.DIRTY_PUSH);
contact.parseSubscriptionFromElement(item);
}
} }
} }
} }