From 0c822b0225ee2ab41deaeaa04c4e4b128905949c Mon Sep 17 00:00:00 2001 From: paweldomas Date: Fri, 13 Dec 2013 12:43:33 +0100 Subject: [PATCH] Fixes problem with orphaned XMPP contacts when groups have the same name. Logging improvements. --- .../impl/contactlist/MetaContactListServiceImpl.java | 6 ++++-- .../impl/protocol/jabber/ContactGroupJabberImpl.java | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java index 3d8708b40..6bd71b33b 100644 --- a/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java +++ b/src/net/java/sip/communicator/impl/contactlist/MetaContactListServiceImpl.java @@ -1478,6 +1478,9 @@ public void removeContactGroupFromMetaContactGroup( // if we failed to find the metagroup corresponding to proto group if(metaContainer == null) { + logger.warn( + "No meta container found, when trying to remove group: " + + groupToRemove); return; } @@ -2053,8 +2056,7 @@ private void handleProviderRemoved( ProtocolProviderService provider) { if (logger.isDebugEnabled()) - logger.debug("Removing protocol provider " - + provider.getProtocolName()); + logger.debug("Removing protocol provider " + provider); this.currentlyInstalledProviders. remove(provider.getAccountID().getAccountUniqueID()); diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/ContactGroupJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/ContactGroupJabberImpl.java index 3054e5d3f..eb7a8edf4 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/ContactGroupJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/ContactGroupJabberImpl.java @@ -308,6 +308,9 @@ public boolean equals(Object obj) if(!((ContactGroup)obj).getGroupName().equals(getGroupName())) return false; + if(getProtocolProvider() != ((ContactGroup)obj).getProtocolProvider()) + return false; + //since Jabber does not support having two groups with the same name // at this point we could bravely state that the groups are the same // and not bother to compare buddies. (gotta check that though)