From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Mon, 10 Sep 2012 11:27:56 +0000 (+0200)
Subject: Use WebOfTrust updater to set contexts and properties.
X-Git-Tag: 0.8.3^2~45
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=eb09646776e30665aa33e4a638ec3a4b3fe0632f

Use WebOfTrust updater to set contexts and properties.
---

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 6912483..29972a0 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -54,7 +54,6 @@ import net.pterodactylus.sone.freenet.wot.IdentityListener;
 import net.pterodactylus.sone.freenet.wot.IdentityManager;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
 import net.pterodactylus.sone.freenet.wot.Trust;
-import net.pterodactylus.sone.freenet.wot.WebOfTrustException;
 import net.pterodactylus.sone.main.SonePlugin;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
@@ -891,10 +890,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 * @return The created Sone
 	 */
 	public Sone createSone(OwnIdentity ownIdentity) {
-		try {
-			ownIdentity.addContext("Sone");
-		} catch (WebOfTrustException wote1) {
-			logger.log(Level.SEVERE, String.format("Could not add “Sone” context to own identity: %s", ownIdentity), wote1);
+		if (!webOfTrustUpdater.addContextWait(ownIdentity, "Sone")) {
+			logger.log(Level.SEVERE, String.format("Could not add “Sone” context to own identity: %s", ownIdentity));
 			return null;
 		}
 		Sone sone = addLocalSone(ownIdentity);
@@ -1279,12 +1276,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			soneInserter.removeSoneInsertListener(this);
 			soneInserter.stop();
 		}
-		try {
-			((OwnIdentity) sone.getIdentity()).removeContext("Sone");
-			((OwnIdentity) sone.getIdentity()).removeProperty("Sone.LatestEdition");
-		} catch (WebOfTrustException wote1) {
-			logger.log(Level.WARNING, String.format("Could not remove context and properties from Sone: %s", sone), wote1);
-		}
+		webOfTrustUpdater.removeContext((OwnIdentity) sone.getIdentity(), "Sone");
+		webOfTrustUpdater.removeProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition");
 		try {
 			configuration.getLongValue("Sone/" + sone.getId() + "/Time").setValue(null);
 		} catch (ConfigurationException ce1) {
@@ -2139,13 +2132,11 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 
 			configuration.save();
 
-			((OwnIdentity) sone.getIdentity()).setProperty("Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
+			webOfTrustUpdater.setProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
 
 			logger.log(Level.INFO, String.format("Sone %s saved.", sone));
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.WARNING, String.format("Could not save Sone: %s", sone), ce1);
-		} catch (WebOfTrustException wote1) {
-			logger.log(Level.WARNING, String.format("Could not set WoT property for Sone: %s", sone), wote1);
 		}
 	}