X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=d496c35e1bdd2ad28beaa53127331e03208baf59;hp=4001f46dcb9d8ca177cf4d9f17b26852f8a2a8dc;hb=ed79caa2308c08a69b077dfb80728a9d78780d0b;hpb=50ce65f69e49ed10abeedaeb6615ffb37a0c0772

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 4001f46..d496c35 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -112,6 +112,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	/** The update checker. */
 	private final UpdateChecker updateChecker;
 
+	/** The trust updater. */
+	private final TrustUpdater trustUpdater;
+
 	/** The FCP interface. */
 	private volatile FcpInterface fcpInterface;
 
@@ -185,7 +188,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 * @param identityManager
 	 *            The identity manager
 	 */
-	public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager) {
+	public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, TrustUpdater trustUpdater) {
 		super("Sone Core");
 		this.configuration = configuration;
 		this.freenetInterface = freenetInterface;
@@ -193,6 +196,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		this.soneDownloader = new SoneDownloader(this, freenetInterface);
 		this.imageInserter = new ImageInserter(this, freenetInterface);
 		this.updateChecker = new UpdateChecker(freenetInterface);
+		this.trustUpdater = trustUpdater;
 	}
 
 	//
@@ -1054,6 +1058,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			logger.log(Level.WARNING, String.format("Tried to get trust from remote Sone: %s", origin));
 			return null;
 		}
+		trustUpdater.getTrust((OwnIdentity) origin.getIdentity(), target.getIdentity());
 		return target.getIdentity().getTrust((OwnIdentity) origin.getIdentity());
 	}
 
@@ -1069,11 +1074,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 */
 	public void setTrust(Sone origin, Sone target, int trustValue) {
 		Validation.begin().isNotNull("Trust Origin", origin).check().isInstanceOf("Trust Origin", origin.getIdentity(), OwnIdentity.class).isNotNull("Trust Target", target).isLessOrEqual("Trust Value", trustValue, 100).isGreaterOrEqual("Trust Value", trustValue, -100).check();
-		try {
-			((OwnIdentity) origin.getIdentity()).setTrust(target.getIdentity(), trustValue, preferences.getTrustComment());
-		} catch (WebOfTrustException wote1) {
-			logger.log(Level.WARNING, String.format("Could not set trust for Sone: %s", target), wote1);
-		}
+		trustUpdater.setTrust((OwnIdentity) origin.getIdentity(), target.getIdentity(), trustValue, preferences.getTrustComment());
 	}
 
 	/**
@@ -1086,11 +1087,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 */
 	public void removeTrust(Sone origin, Sone target) {
 		Validation.begin().isNotNull("Trust Origin", origin).isNotNull("Trust Target", target).check().isInstanceOf("Trust Origin Identity", origin.getIdentity(), OwnIdentity.class).check();
-		try {
-			((OwnIdentity) origin.getIdentity()).removeTrust(target.getIdentity());
-		} catch (WebOfTrustException wote1) {
-			logger.log(Level.WARNING, String.format("Could not remove trust for Sone: %s", target), wote1);
-		}
+		trustUpdater.setTrust((OwnIdentity) origin.getIdentity(), target.getIdentity(), null, null);
 	}
 
 	/**
@@ -1967,6 +1964,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		loadConfiguration();
 		updateChecker.addUpdateListener(this);
 		updateChecker.start();
+		trustUpdater.start();
 	}
 
 	/**
@@ -1999,6 +1997,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 				soneInserter.stop();
 			}
 		}
+		trustUpdater.stop();
 		updateChecker.stop();
 		updateChecker.removeUpdateListener(this);
 		soneDownloader.stop();