X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityManager.java;h=8e0b1244911063b2a4cfa754d5a4e19844c8010d;hp=803bc323b63cbbb87d618768799ba0cc937695d4;hb=17ed3b897e37c8b16c559b79bfe97d32a7605bfb;hpb=dbb47149d5e2c1e67ec9889587ff24dd7c622862

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 803bc32..8e0b124 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
@@ -1,5 +1,5 @@
 /*
- * Sone - IdentityManager.java - Copyright © 2010 David Roden
+ * Sone - IdentityManager.java - Copyright © 2010–2012 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,8 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.pterodactylus.sone.freenet.plugin.PluginException;
+import net.pterodactylus.util.collection.mapper.Mapper;
+import net.pterodactylus.util.collection.mapper.Mappers;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
 
@@ -43,6 +45,7 @@ import net.pterodactylus.util.service.AbstractService;
 public class IdentityManager extends AbstractService {
 
 	/** Object used for synchronization. */
+	@SuppressWarnings("hiding")
 	private final Object syncObject = new Object() {
 		/* inner class for better lock names. */
 	};
@@ -140,7 +143,7 @@ public class IdentityManager extends AbstractService {
 		Set<OwnIdentity> allOwnIdentities = getAllOwnIdentities();
 		for (OwnIdentity ownIdentity : allOwnIdentities) {
 			if (ownIdentity.getId().equals(id)) {
-				return ownIdentity;
+				return new DefaultOwnIdentity(ownIdentity);
 			}
 		}
 		return null;
@@ -159,7 +162,16 @@ public class IdentityManager extends AbstractService {
 				newOwnIdentities.put(ownIdentity.getId(), ownIdentity);
 			}
 			checkOwnIdentities(newOwnIdentities);
-			return ownIdentities;
+			return Mappers.mappedSet(ownIdentities, new Mapper<OwnIdentity, OwnIdentity>() {
+
+				/**
+				 * {@inheritDoc}
+				 */
+				@Override
+				public OwnIdentity map(OwnIdentity input) {
+					return new DefaultOwnIdentity(input);
+				}
+			});
 		} catch (WebOfTrustException wote1) {
 			logger.log(Level.WARNING, "Could not load all own identities!", wote1);
 			return Collections.emptySet();
@@ -178,7 +190,6 @@ public class IdentityManager extends AbstractService {
 		Map<OwnIdentity, Map<String, Identity>> oldIdentities = Collections.emptyMap();
 		while (!shouldStop()) {
 			Map<OwnIdentity, Map<String, Identity>> currentIdentities = new HashMap<OwnIdentity, Map<String, Identity>>();
-			@SuppressWarnings("hiding")
 			Map<String, OwnIdentity> currentOwnIdentities = new HashMap<String, OwnIdentity>();
 
 			Set<OwnIdentity> ownIdentities = null;
@@ -296,15 +307,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(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(currentOwnIdentity));
 				}
 			}