Match latest changes in WoT.

[Sone.git] / src / main / java / net / pterodactylus / sone / freenet / wot / WebOfTrustConnector.java

diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
index d7c8289..0425e47 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
@@ -88,8 +88,8 @@ public class WebOfTrustConnector implements ConnectorListener {
                        String insertUri = fields.get("InsertURI" + ownIdentityCounter);
                        String nickname = fields.get("Nickname" + ownIdentityCounter);
                        OwnIdentity ownIdentity = new OwnIdentity(id, nickname, requestUri, insertUri);
-                       ownIdentity.setContexts(parseContexts("Contexts" + ownIdentityCounter, fields));
-                       ownIdentity.setProperties(parseProperties("Properties" + ownIdentityCounter, fields));
+                       ownIdentity.setContexts(parseContexts("Contexts" + ownIdentityCounter + ".", fields));
+                       ownIdentity.setProperties(parseProperties("Properties" + ownIdentityCounter + ".", fields));
                        ownIdentities.add(ownIdentity);
                }
                return ownIdentities;
@@ -134,8 +134,8 @@ public class WebOfTrustConnector implements ConnectorListener {
                        String nickname = fields.get("Nickname" + identityCounter);
                        String requestUri = fields.get("RequestURI" + identityCounter);
                        Identity identity = new Identity(id, nickname, requestUri);
-                       identity.setContexts(parseContexts("Contexts" + identityCounter, fields));
-                       identity.setProperties(parseProperties("Properties" + identityCounter, fields));
+                       identity.setContexts(parseContexts("Contexts" + identityCounter + ".", fields));
+                       identity.setProperties(parseProperties("Properties" + identityCounter + ".", fields));
                        identities.add(identity);
                }
                return identities;
@@ -215,6 +215,17 @@ public class WebOfTrustConnector implements ConnectorListener {
                performRequest(SimpleFieldSetConstructor.create().put("Message", "RemoveProperty").put("Identity", ownIdentity.getId()).put("Property", name).get(), "PropertyRemoved");
        }
 
+       /**
+        * Pings the Web of Trust plugin. If the plugin can not be reached, a
+        * {@link PluginException} is thrown.
+        *
+        * @throws PluginException
+        *             if the plugin is not loaded
+        */
+       public void ping() throws PluginException {
+               performRequest(SimpleFieldSetConstructor.create().put("Message", "Ping").get(), "Pong");
+       }
+
        //
        // PRIVATE ACTIONS
        //
@@ -254,11 +265,11 @@ public class WebOfTrustConnector implements ConnectorListener {
                Map<String, String> properties = new HashMap<String, String>();
                int propertiesCounter = -1;
                while (true) {
-                       String propertyName = fields.get(prefix + "Property" + ++propertiesCounter + "Name");
+                       String propertyName = fields.get(prefix + "Property" + ++propertiesCounter + ".Name");
                        if (propertyName == null) {
                                break;
                        }
-                       String propertyValue = fields.get(prefix + "Property" + ++propertiesCounter + "Value");
+                       String propertyValue = fields.get(prefix + "Property" + propertiesCounter + ".Value");
                        properties.put(propertyName, propertyValue);
                }
                return properties;
@@ -304,9 +315,15 @@ public class WebOfTrustConnector implements ConnectorListener {
                synchronized (reply) {
                        pluginConnector.sendRequest(WOT_PLUGIN_NAME, PLUGIN_CONNECTION_IDENTIFIER, fields, data);
                        try {
-                               reply.wait(60000);
+                               long now = System.currentTimeMillis();
+                               while ((reply.getFields() == null) && ((System.currentTimeMillis() - now) < 60000)) {
+                                       reply.wait(60000 - (System.currentTimeMillis() - now));
+                               }
+                               if (reply.getFields() == null) {
+                                       throw new PluginException("Timeout waiting for " + targetMessages[0] + "!");
+                               }
                        } catch (InterruptedException ie1) {
-                               logger.log(Level.WARNING, "Got interrupted while waiting for reply on GetOwnIdentities.", ie1);
+                               logger.log(Level.WARNING, "Got interrupted while waiting for reply on " + targetMessages[0] + ".", ie1);
                        }
                }
                for (String targetMessage : targetMessages) {
@@ -329,6 +346,7 @@ public class WebOfTrustConnector implements ConnectorListener {
        @Override
        public void receivedReply(PluginConnector pluginConnector, SimpleFieldSet fields, Bucket data) {
                String messageName = fields.get("Message");
+               logger.log(Level.FINEST, "Received Reply from Plugin: " + messageName);
                Reply reply = replies.remove(messageName);
                if (reply == null) {
                        logger.log(Level.FINE, "Not waiting for a “%s” message.", messageName);