Merge branch 'release-0.0.4'

diff --git a/pom.xml b/pom.xml
index 37e947e..442de94 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.3</version>
+       <version>0.0.4</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 ea90dac..17c440e 100644 (file)
--- a/src/main/java/net/pterodactylus/wotns/freenet/wot/IdentityManager.java
+++ b/src/main/java/net/pterodactylus/wotns/freenet/wot/IdentityManager.java
@@ -192,6 +192,7 @@ public class IdentityManager extends AbstractService {
                                newTrustedIdentities.put(trustedIdentity.getId(), trustedIdentity);
                        }
                        checkTrustedIdentities(ownIdentity, newTrustedIdentities);
+                       identities.addAll(trustedIdentities);
                } catch (WebOfTrustException wote1) {
                        logger.log(Level.WARNING, String.format("Could not load all trusted identities for %s.", ownIdentity), wote1);
                }

diff --git a/src/main/java/net/pterodactylus/wotns/main/Resolver.java b/src/main/java/net/pterodactylus/wotns/main/Resolver.java
index 1c00144..0150f45 100644 (file)
--- a/src/main/java/net/pterodactylus/wotns/main/Resolver.java
+++ b/src/main/java/net/pterodactylus/wotns/main/Resolver.java
@@ -46,6 +46,10 @@ public class Resolver {
                this.identityManager = identityManager;
        }
 
+       public String getOwnIdentityId() {
+               return ownIdentityId;
+       }
+
        public void setOwnIdentityId(String ownIdentityId) {
                this.ownIdentityId = ownIdentityId;
        }

diff --git a/src/main/java/net/pterodactylus/wotns/main/WoTNSPlugin.java b/src/main/java/net/pterodactylus/wotns/main/WoTNSPlugin.java
index f24afc7..7bb6e89 100644 (file)
--- 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, 3);
+       private static final Version VERSION = new Version(0, 0, 4);
 
        private PluginRespirator pluginRespirator;
 

diff --git a/src/main/java/net/pterodactylus/wotns/ui/web/BasicPage.java b/src/main/java/net/pterodactylus/wotns/ui/web/BasicPage.java
index 85ad8b1..2921c7e 100644 (file)
--- a/src/main/java/net/pterodactylus/wotns/ui/web/BasicPage.java
+++ b/src/main/java/net/pterodactylus/wotns/ui/web/BasicPage.java
@@ -53,11 +53,15 @@ public class BasicPage extends FreenetTemplatePage {
        //
 
        protected OwnIdentity getOwnIdentity(FreenetRequest request) {
+               return getOwnIdentity(request, "ownIdentity");
+       }
+
+       protected OwnIdentity getOwnIdentity(FreenetRequest request, String parameterName) {
                if (request.getMethod() == Method.POST) {
-                       String ownIdentityId = request.getHttpRequest().getPartAsStringFailsafe("ownIdentity", 43);
+                       String ownIdentityId = request.getHttpRequest().getPartAsStringFailsafe(parameterName, 43);
                        return identityManager.getOwnIdentity(ownIdentityId);
                } else if (request.getMethod() == Method.GET) {
-                       String ownIdentityId = request.getHttpRequest().getParam("ownIdentity");
+                       String ownIdentityId = request.getHttpRequest().getParam(parameterName);
                        return identityManager.getOwnIdentity(ownIdentityId);
                }
                return null;