X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=9e1e6c66c1172c9879f4a73a3729346f8eb9f228;hp=6912483742067ab6957795e004b938d161970815;hb=d1e011bc62bede509d8482dfeea950823b974413;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..9e1e6c6 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -53,8 +53,6 @@ import net.pterodactylus.sone.freenet.wot.Identity;
 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 +889,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);
@@ -1045,26 +1041,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	}
 
 	/**
-	 * Retrieves the trust relationship from the origin to the target. If the
-	 * trust relationship can not be retrieved, {@code null} is returned.
-	 *
-	 * @see Identity#getTrust(OwnIdentity)
-	 * @param origin
-	 *            The origin of the trust tree
-	 * @param target
-	 *            The target of the trust
-	 * @return The trust relationship
-	 */
-	public Trust getTrust(Sone origin, Sone target) {
-		if (!isLocalSone(origin)) {
-			logger.log(Level.WARNING, String.format("Tried to get trust from remote Sone: %s", origin));
-			return null;
-		}
-		webOfTrustUpdater.getTrust((OwnIdentity) origin.getIdentity(), target.getIdentity());
-		return target.getIdentity().getTrust((OwnIdentity) origin.getIdentity());
-	}
-
-	/**
 	 * Sets the trust value of the given origin Sone for the target Sone.
 	 *
 	 * @param origin
@@ -1279,12 +1255,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 +1828,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		synchronized (albums) {
 			albums.remove(album.getId());
 		}
-		saveSone(album.getSone());
+		touchConfiguration();
 	}
 
 	/**
@@ -1896,7 +1868,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		synchronized (images) {
 			images.remove(image.getId());
 		}
-		saveSone(image.getSone());
+		touchConfiguration();
 	}
 
 	/**
@@ -1994,11 +1966,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	@Override
 	public void serviceStop() {
 		synchronized (localSones) {
-			for (SoneInserter soneInserter : soneInserters.values()) {
-				soneInserter.removeSoneInsertListener(this);
-				soneInserter.stop();
+			for (Entry<Sone, SoneInserter> soneInserter : soneInserters.entrySet()) {
+				soneInserter.getValue().removeSoneInsertListener(this);
+				soneInserter.getValue().stop();
+				saveSone(soneInserter.getKey());
 			}
 		}
+		saveConfiguration();
 		webOfTrustUpdater.stop();
 		updateChecker.stop();
 		updateChecker.removeUpdateListener(this);
@@ -2139,13 +2113,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);
 		}
 	}
 
@@ -2378,12 +2350,12 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 *            The URI to derive the Sone URI from
 	 * @return The derived URI
 	 */
-	private FreenetURI getSoneUri(String uriString) {
+	private static FreenetURI getSoneUri(String uriString) {
 		try {
 			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 +2530,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);
 	}