X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityManager.java;h=04d95611cfa194583ff5b7adaf6785a86c32cb7a;hb=5d8f3ac133544177412ec3c533e5f5f92a7b1c35;hp=32c0d27e7ac1cb485ebd6c30e7ccc142a7a7d6cf;hpb=0acd68634f3e73c62087609c1faa2dfc53da506d;p=Sone.git

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 32c0d27..04d9561 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
@@ -19,6 +19,7 @@ package net.pterodactylus.sone.freenet.wot;
 
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -26,11 +27,12 @@ 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;
 
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+
 /**
  * The identity manager takes care of loading and storing identities, their
  * contexts, and properties. It does so in a way that does not expose errors via
@@ -60,21 +62,29 @@ public class IdentityManager extends AbstractService {
 	private final WebOfTrustConnector webOfTrustConnector;
 
 	/** The context to filter for. */
-	private volatile String context;
+	private final String context;
 
 	/** The currently known own identities. */
 	/* synchronize access on syncObject. */
-	private Map<String, OwnIdentity> currentOwnIdentities = new HashMap<String, OwnIdentity>();
+	private final Map<String, OwnIdentity> currentOwnIdentities = new HashMap<String, OwnIdentity>();
+
+	/** The last time all identities were loaded. */
+	private volatile long identitiesLastLoaded;
 
 	/**
 	 * Creates a new identity manager.
 	 *
 	 * @param webOfTrustConnector
 	 *            The Web of Trust connector
+	 * @param context
+	 *            The context to focus on (may be {@code null} to ignore
+	 *            contexts)
 	 */
-	public IdentityManager(WebOfTrustConnector webOfTrustConnector) {
+	@Inject
+	public IdentityManager(WebOfTrustConnector webOfTrustConnector, @Named("WebOfTrustContext") String context) {
 		super("Sone Identity Manager", false);
 		this.webOfTrustConnector = webOfTrustConnector;
+		this.context = context;
 	}
 
 	//
@@ -106,13 +116,13 @@ public class IdentityManager extends AbstractService {
 	//
 
 	/**
-	 * Sets the context to filter own identities and trusted identities for.
+	 * Returns the last time all identities were loaded.
 	 *
-	 * @param context
-	 *            The context to filter for, or {@code null} to not filter
+	 * @return The last time all identities were loaded (in milliseconds since
+	 *         Jan 1, 1970 UTC)
 	 */
-	public void setContext(String context) {
-		this.context = context;
+	public long getIdentitiesLastLoaded() {
+		return identitiesLastLoaded;
 	}
 
 	/**
@@ -143,7 +153,7 @@ public class IdentityManager extends AbstractService {
 		Set<OwnIdentity> allOwnIdentities = getAllOwnIdentities();
 		for (OwnIdentity ownIdentity : allOwnIdentities) {
 			if (ownIdentity.getId().equals(id)) {
-				return new DefaultOwnIdentity(webOfTrustConnector, ownIdentity);
+				return new DefaultOwnIdentity(ownIdentity);
 			}
 		}
 		return null;
@@ -155,28 +165,7 @@ public class IdentityManager extends AbstractService {
 	 * @return All own identities
 	 */
 	public Set<OwnIdentity> getAllOwnIdentities() {
-		try {
-			Set<OwnIdentity> ownIdentities = webOfTrustConnector.loadAllOwnIdentities();
-			Map<String, OwnIdentity> newOwnIdentities = new HashMap<String, OwnIdentity>();
-			for (OwnIdentity ownIdentity : ownIdentities) {
-				newOwnIdentities.put(ownIdentity.getId(), ownIdentity);
-			}
-			checkOwnIdentities(newOwnIdentities);
-			return Mappers.mappedSet(ownIdentities, new Mapper<OwnIdentity, OwnIdentity>() {
-
-				/**
-				 * {@inheritDoc}
-				 */
-				@Override
-				@SuppressWarnings("synthetic-access")
-				public OwnIdentity map(OwnIdentity input) {
-					return new DefaultOwnIdentity(webOfTrustConnector, input);
-				}
-			});
-		} catch (WebOfTrustException wote1) {
-			logger.log(Level.WARNING, "Could not load all own identities!", wote1);
-			return Collections.emptySet();
-		}
+		return new HashSet<OwnIdentity>(currentOwnIdentities.values());
 	}
 
 	//
@@ -201,19 +190,23 @@ public class IdentityManager extends AbstractService {
 
 				/* load trusted identities. */
 				for (OwnIdentity ownIdentity : ownIdentities) {
+					currentOwnIdentities.put(ownIdentity.getId(), ownIdentity);
+					Map<String, Identity> identities = new HashMap<String, Identity>();
+					currentIdentities.put(ownIdentity, identities);
+
+					/* if the context doesn’t match, skip getting trusted identities. */
 					if ((context != null) && !ownIdentity.hasContext(context)) {
 						continue;
 					}
-					currentOwnIdentities.put(ownIdentity.getId(), ownIdentity);
 
+					/* load trusted identities. */
 					Set<Identity> trustedIdentities = webOfTrustConnector.loadTrustedIdentities(ownIdentity, context);
-					Map<String, Identity> identities = new HashMap<String, Identity>();
-					currentIdentities.put(ownIdentity, identities);
 					for (Identity identity : trustedIdentities) {
 						identities.put(identity.getId(), identity);
 					}
 				}
 				identitiesLoaded = true;
+				identitiesLastLoaded = System.currentTimeMillis();
 			} catch (WebOfTrustException wote1) {
 				logger.log(Level.WARNING, "WoT has disappeared!", wote1);
 			}
@@ -310,7 +303,7 @@ public class IdentityManager extends AbstractService {
 			for (OwnIdentity oldOwnIdentity : currentOwnIdentities.values()) {
 				OwnIdentity newOwnIdentity = newOwnIdentities.get(oldOwnIdentity.getId());
 				if ((newOwnIdentity == null) || ((context != null) && oldOwnIdentity.hasContext(context) && !newOwnIdentity.hasContext(context))) {
-					identityListenerManager.fireOwnIdentityRemoved(new DefaultOwnIdentity(webOfTrustConnector, oldOwnIdentity));
+					identityListenerManager.fireOwnIdentityRemoved(new DefaultOwnIdentity(oldOwnIdentity));
 				}
 			}
 
@@ -318,7 +311,7 @@ public class IdentityManager extends AbstractService {
 			for (OwnIdentity currentOwnIdentity : newOwnIdentities.values()) {
 				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));
+					identityListenerManager.fireOwnIdentityAdded(new DefaultOwnIdentity(currentOwnIdentity));
 				}
 			}