X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FWebOfTrustConnector.java;h=61068f8845eb7a77ce30d15c33568f7c167a62ea;hb=1bc88510da721fc90b270e4706ee2bdab41ecd18;hp=4758d9589694dea562a98a73b72188de0e827bbf;hpb=ba7980516278401d16e947fad2502e62c0c24160;p=Sone.git

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 4758d95..61068f8 100644
--- a/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
+++ b/src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
@@ -25,6 +25,9 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import net.pterodactylus.sone.freenet.plugin.ConnectorListener;
+import net.pterodactylus.sone.freenet.plugin.PluginConnector;
+import net.pterodactylus.sone.freenet.plugin.PluginException;
 import net.pterodactylus.util.logging.Logging;
 import freenet.support.SimpleFieldSet;
 import freenet.support.api.Bucket;
@@ -71,10 +74,10 @@ public class WebOfTrustConnector implements ConnectorListener {
 	 * Loads all own identities from the Web of Trust plugin.
 	 *
 	 * @return All own identity
-	 * @throws PluginException
+	 * @throws WebOfTrustException
 	 *             if the own identities can not be loaded
 	 */
-	public Set<OwnIdentity> loadAllOwnIdentities() throws PluginException {
+	public Set<OwnIdentity> loadAllOwnIdentities() throws WebOfTrustException {
 		Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetOwnIdentities").get(), "OwnIdentities");
 		SimpleFieldSet fields = reply.getFields();
 		int ownIdentityCounter = -1;
@@ -88,8 +91,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 +137,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 +218,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 +268,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 +318,19 @@ 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) {
+					for (String targetMessage : targetMessages) {
+						replies.remove(targetMessage);
+					}
+					replies.remove("Error");
+					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 +353,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);