From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 16 Sep 2011 14:29:38 +0000 (+0200)
Subject: Merge branch 'release-0.0.5'
X-Git-Tag: 0.0.5^0
X-Git-Url: https://git.pterodactylus.net/?p=WoTNS.git;a=commitdiff_plain;h=8ac7dd851aeeff0d59caa4fd7a37bdf5b9492a7b;hp=c8a7ff686d3cdf2ff1c65f94935a99e824cfb36d

Merge branch 'release-0.0.5'
---

diff --git a/pom.xml b/pom.xml
index 442de94..01952d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.pterodactylus</groupId>
 	<artifactId>WoTNS</artifactId>
-	<version>0.0.4</version>
+	<version>0.0.5</version>
 	<dependencies>
 		<dependency>
 			<groupId>net.pterodactylus</groupId>
diff --git a/src/main/java/net/pterodactylus/wotns/freenet/wot/IdentityManager.java b/src/main/java/net/pterodactylus/wotns/freenet/wot/IdentityManager.java
index 17c440e..1c30752 100644
--- a/src/main/java/net/pterodactylus/wotns/freenet/wot/IdentityManager.java
+++ b/src/main/java/net/pterodactylus/wotns/freenet/wot/IdentityManager.java
@@ -182,8 +182,10 @@ public class IdentityManager extends AbstractService {
 	 */
 	public Set<Identity> getTrustedIdentities(OwnIdentity ownIdentity) {
 		Set<Identity> identities = new HashSet<Identity>();
-		if ((context == null) || ownIdentity.getContexts().contains(context)) {
-			identities.add(ownIdentity);
+		for (OwnIdentity additionalOwnIdentity : getAllOwnIdentities()) {
+			if ((context == null) || additionalOwnIdentity.getContexts().contains(context)) {
+				identities.add(additionalOwnIdentity);
+			}
 		}
 		try {
 			Set<Identity> trustedIdentities = webOfTrustConnector.loadTrustedIdentities(ownIdentity, context);
diff --git a/src/main/java/net/pterodactylus/wotns/main/WoTNSPlugin.java b/src/main/java/net/pterodactylus/wotns/main/WoTNSPlugin.java
index 7bb6e89..f25fa70 100644
--- a/src/main/java/net/pterodactylus/wotns/main/WoTNSPlugin.java
+++ b/src/main/java/net/pterodactylus/wotns/main/WoTNSPlugin.java
@@ -46,7 +46,7 @@ public class WoTNSPlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL1
 		Logging.setupConsoleLogging();
 	}
 
-	private static final Version VERSION = new Version(0, 0, 4);
+	private static final Version VERSION = new Version(0, 0, 5);
 
 	private PluginRespirator pluginRespirator;