Merge branch 'release-0.0.5' 0.0.5
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 16 Sep 2011 14:29:38 +0000 (16:29 +0200)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 16 Sep 2011 14:29:38 +0000 (16:29 +0200)
pom.xml
src/main/java/net/pterodactylus/wotns/freenet/wot/IdentityManager.java
src/main/java/net/pterodactylus/wotns/main/WoTNSPlugin.java

diff --git a/pom.xml b/pom.xml
index 442de94..01952d3 100644 (file)
--- 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>
index 17c440e..1c30752 100644 (file)
@@ -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);
index 7bb6e89..f25fa70 100644 (file)
@@ -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;