Removes notifications that are no longer available.

1 files changed, 35 insertions, 14 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/notifsource/NotificationGroup.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/notifsource/NotificationGroup.java
index ff5a88b..8a3967a 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/notifsource/NotificationGroup.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/notifsource/NotificationGroup.java
@@ -201,25 +201,31 @@ public class NotificationGroup
 
         if (messages != null)
         {
-            // find messages that need to be removed
-            Hashtable<String, NotificationContact> contactToRemove =
-                (Hashtable<String, NotificationContact>)contacts.clone();
-            while (messages.hasNext())
+            // Removes contacts that are no longer available.
+            Enumeration<String> contactIdentifiers = contacts.keys();
+            while (contactIdentifiers.hasMoreElements())
             {
-                NotificationMessage message = messages.next();
+                String identifier = contactIdentifiers.nextElement();
 
-                if (message.getMessageGroup().equals(groupName))
+                boolean toRemove = true;
+                messages = event.getMessages();
+                while (messages.hasNext())
                 {
+                    NotificationMessage message = messages.next();
                     String messageIdentifier
-                        = message.getFromContact() + message.getMessageDetails();
-                    contactToRemove.remove(messageIdentifier);
+                        = message.getFromContact()
+                            + message.getMessageDetails();
+
+                    if (identifier.equals(messageIdentifier))
+                    {
+                        toRemove = false;
+                        break;
+                    }
+                }
+                if (toRemove)
+                {
+                    removeNotificationContact(contacts.get(identifier));
                 }
-            }
-            // now remove what needs to be removed
-            TreeContactList contactList = GuiActivator.getContactList();
-            for(NotificationContact c : contactToRemove.values())
-            {
-                contactList.removeContact(c);
             }
 
             messages = event.getMessages();
@@ -315,4 +321,19 @@ public class NotificationGroup
                     contact.getUnreadMessageCount()));
         }
     }
+
+    /**
+     * Removes the given <tt>NotificationContact</tt>.
+     *
+     * @param contact the <tt>NotificationContact</tt> to remove
+     */
+    private void removeNotificationContact(NotificationContact contact)
+    {
+        TreeContactList contactList = GuiActivator.getContactList();
+
+        if (contactList.getCurrentFilter().isMatching(contact))
+        {
+            contactList.removeContact(contact);
+        }
+    }
 }