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=bca6ac11a962ddb961fc2c8e28b94395ec1c978b;hpb=61fea0173ef87542cae35247e6356ef36f2664d3;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 bca6ac1..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
@@ -77,7 +80,8 @@ public class IdentityManager extends AbstractService {
 	 *            The context to focus on (may be {@code null} to ignore
 	 *            contexts)
 	 */
-	public IdentityManager(WebOfTrustConnector webOfTrustConnector, String context) {
+	@Inject
+	public IdentityManager(WebOfTrustConnector webOfTrustConnector, @Named("WebOfTrustContext") String context) {
 		super("Sone Identity Manager", false);
 		this.webOfTrustConnector = webOfTrustConnector;
 		this.context = context;
@@ -186,14 +190,17 @@ 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);
 					}