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=3c3c9f9221cc64e8e0c7276fe80cfb07a80a0df6;hpb=4970a2332d0295fa4e428e1f4ea54bd2d839e464;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 3c3c9f9..04d9561 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java
@@ -30,6 +30,9 @@ import net.pterodactylus.sone.freenet.plugin.PluginException;
 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
@@ -59,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;
 	}
 
 	//
@@ -105,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;
 	}
 
 	/**
@@ -179,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);
 			}