Send a copy of the default own identities to the event listeners.

[Sone.git] / src / main / java / net / pterodactylus / sone / freenet / wot / IdentityManager.java

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
index 3c97e55..065aa47 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
@@ -295,15 +295,17 @@ public class IdentityManager extends AbstractService {
 
                        /* find removed own identities: */
                        for (OwnIdentity oldOwnIdentity : currentOwnIdentities.values()) {
-                               if (!newOwnIdentities.containsKey(oldOwnIdentity.getId())) {
-                                       identityListenerManager.fireOwnIdentityRemoved(oldOwnIdentity);
+                               OwnIdentity newOwnIdentity = newOwnIdentities.get(oldOwnIdentity.getId());
+                               if ((newOwnIdentity == null) || ((context != null) && oldOwnIdentity.hasContext(context) && !newOwnIdentity.hasContext(context))) {
+                                       identityListenerManager.fireOwnIdentityRemoved(new DefaultOwnIdentity(webOfTrustConnector, oldOwnIdentity));
                                }
                        }
 
                        /* find added own identities. */
                        for (OwnIdentity currentOwnIdentity : newOwnIdentities.values()) {
-                               if (!currentOwnIdentities.containsKey(currentOwnIdentity.getId())) {
-                                       identityListenerManager.fireOwnIdentityAdded(currentOwnIdentity);
+                               OwnIdentity oldOwnIdentity = currentOwnIdentities.get(currentOwnIdentity.getId());
+                               if (((oldOwnIdentity == null) && ((context == null) || currentOwnIdentity.hasContext(context))) || ((oldOwnIdentity != null) && (context != null) && (!oldOwnIdentity.hasContext(context) && currentOwnIdentity.hasContext(context)))) {
+                                       identityListenerManager.fireOwnIdentityAdded(new DefaultOwnIdentity(webOfTrustConnector, currentOwnIdentity));
                                }
                        }