X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=e3fdd1975a06022cfaba1a4556d0740f736bb046;hp=6912483742067ab6957795e004b938d161970815;hb=864f0802a2ae1cfaf4f94b3c29292aec31be1081;hpb=d3178fa18df4c609e6acc1ac49a0fca42075d0d7

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 6912483..e3fdd19 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) {
@@ -1856,7 +1849,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		synchronized (albums) {
 			albums.remove(album.getId());
 		}
-		saveSone(album.getSone());
+		touchConfiguration();
 	}
 
 	/**
@@ -1896,7 +1889,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		synchronized (images) {
 			images.remove(image.getId());
 		}
-		saveSone(image.getSone());
+		touchConfiguration();
 	}
 
 	/**
@@ -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);
 		}
 	}
 
@@ -2383,7 +2374,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]);
 			return uri;
 		} catch (MalformedURLException mue1) {
-			logger.log(Level.WARNING, String.format("Could not create Sone URI from URI: %s", uriString, mue1));
+			logger.log(Level.WARNING, String.format("Could not create Sone URI from URI: %s", uriString), mue1);
 			return null;
 		}
 	}
@@ -2558,7 +2549,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", image, key));
 		image.setKey(key.toString());
 		deleteTemporaryImage(image.getId());
-		saveSone(image.getSone());
+		touchConfiguration();
 		coreListenerManager.fireImageInsertFinished(image);
 	}