Fix NullPointerException in the contact list.

cusax-fix
Yana Stamcheva 16 years ago
parent e59acc9770
commit 2aeb90331b

@ -860,7 +860,8 @@ public void setGroupClickConsumed(boolean isGroupClickConsumed)
*/
public void stopFiltering()
{
currentFilter.stopFilter();
if (currentFilter != null)
currentFilter.stopFilter();
if (filterQuery != null)
filterQuery.cancel();
@ -1638,7 +1639,7 @@ public void contactPresenceStatusChanged(
uiContact = MetaContactListSource
.createUIContact(metaContact);
if (currentFilter.isMatching(uiContact))
if (currentFilter != null && currentFilter.isMatching(uiContact))
{
MetaContactGroup parentGroup
= metaContact.getParentMetaContactGroup();
@ -1662,7 +1663,7 @@ public void contactPresenceStatusChanged(
}
else
{
if (!currentFilter.isMatching(uiContact))
if (currentFilter != null && !currentFilter.isMatching(uiContact))
removeContact(uiContact);
else
treeModel

Loading…
Cancel
Save