X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=6970058ac16e263ef5112f904fff106237bba7fa;hb=a8a97f37c2bd64a0bf4fe4cb38d61818f5f9a148;hp=6d6c998faeb135e5af6339e7f7a174e4a452befa;hpb=cb6009098271b6ded886490c125857c27e22dc06;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 6d6c998..6970058 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -40,6 +40,7 @@ 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;
@@ -145,6 +146,9 @@ public class Core implements IdentityListener {
 	/** All known replies. */
 	private Set<String> knownReplies = new HashSet<String>();
 
+	/** Trusted identities, sorted by own identities. */
+	private Map<OwnIdentity, Set<Identity>> trustedIdentities = Collections.synchronizedMap(new HashMap<OwnIdentity, Set<Identity>>());
+
 	/**
 	 * Creates a new core.
 	 *
@@ -501,6 +505,19 @@ public class Core implements IdentityListener {
 	}
 
 	/**
+	 * Returns whether the target Sone is trusted by the origin Sone.
+	 *
+	 * @param origin
+	 *            The origin Sone
+	 * @param target
+	 *            The target Sone
+	 * @return {@code true} if the target Sone is trusted by the origin Sone
+	 */
+	public boolean isSoneTrusted(Sone origin, Sone target) {
+		return trustedIdentities.containsKey(origin) && trustedIdentities.get(origin.getIdentity()).contains(target);
+	}
+
+	/**
 	 * Returns the post with the given ID.
 	 *
 	 * @param postId
@@ -711,7 +728,9 @@ public class Core implements IdentityListener {
 	 */
 	public void lockSone(Sone sone) {
 		synchronized (lockedSones) {
-			lockedSones.add(sone);
+			if (lockedSones.add(sone)) {
+				coreListenerManager.fireSoneLocked(sone);
+			}
 		}
 	}
 
@@ -724,7 +743,9 @@ public class Core implements IdentityListener {
 	 */
 	public void unlockSone(Sone sone) {
 		synchronized (lockedSones) {
-			lockedSones.remove(sone);
+			if (lockedSones.remove(sone)) {
+				coreListenerManager.fireSoneUnlocked(sone);
+			}
 		}
 	}
 
@@ -874,6 +895,28 @@ public class Core implements IdentityListener {
 	}
 
 	/**
+	 * Retrieves the trust relationship from the origin to the target.
+	 *
+	 * @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, "Tried to get trust from remote Sone: %s", origin);
+			return null;
+		}
+		try {
+			return target.getIdentity().getTrust((OwnIdentity) origin.getIdentity());
+		} catch (WebOfTrustException wote1) {
+			logger.log(Level.WARNING, "Could not get trust for Sone: " + target, wote1);
+			return null;
+		}
+	}
+
+	/**
 	 * Updates the stores Sone with the given Sone.
 	 *
 	 * @param sone
@@ -1127,7 +1170,7 @@ public class Core implements IdentityListener {
 	 * @param sone
 	 *            The Sone to save
 	 */
-	public void saveSone(Sone sone) {
+	public synchronized void saveSone(Sone sone) {
 		if (!isLocalSone(sone)) {
 			logger.log(Level.FINE, "Tried to save non-local Sone: %s", sone);
 			return;
@@ -1198,6 +1241,7 @@ public class Core implements IdentityListener {
 			}
 			configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
 
+			configuration.save();
 			logger.log(Level.INFO, "Sone %s saved.", sone);
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.WARNING, "Could not save Sone: " + sone, ce1);
@@ -1414,6 +1458,7 @@ public class Core implements IdentityListener {
 				soneInserter.stop();
 			}
 		}
+		soneDownloader.stop();
 		saveConfiguration();
 		stopped = true;
 	}
@@ -1421,7 +1466,7 @@ public class Core implements IdentityListener {
 	/**
 	 * Saves the current options.
 	 */
-	public void saveConfiguration() {
+	public synchronized void saveConfiguration() {
 		/* store the options first. */
 		try {
 			configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal());
@@ -1566,6 +1611,7 @@ public class Core implements IdentityListener {
 	public void ownIdentityAdded(OwnIdentity ownIdentity) {
 		logger.log(Level.FINEST, "Adding OwnIdentity: " + ownIdentity);
 		if (ownIdentity.hasContext("Sone")) {
+			trustedIdentities.put(ownIdentity, Collections.synchronizedSet(new HashSet<Identity>()));
 			addLocalSone(ownIdentity);
 		}
 	}
@@ -1576,14 +1622,16 @@ public class Core implements IdentityListener {
 	@Override
 	public void ownIdentityRemoved(OwnIdentity ownIdentity) {
 		logger.log(Level.FINEST, "Removing OwnIdentity: " + ownIdentity);
+		trustedIdentities.remove(ownIdentity);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public void identityAdded(Identity identity) {
+	public void identityAdded(OwnIdentity ownIdentity, Identity identity) {
 		logger.log(Level.FINEST, "Adding Identity: " + identity);
+		trustedIdentities.get(ownIdentity).add(identity);
 		addRemoteSone(identity);
 	}
 
@@ -1591,7 +1639,7 @@ public class Core implements IdentityListener {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public void identityUpdated(final Identity identity) {
+	public void identityUpdated(OwnIdentity ownIdentity, final Identity identity) {
 		new Thread(new Runnable() {
 
 			@Override
@@ -1607,8 +1655,8 @@ public class Core implements IdentityListener {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public void identityRemoved(Identity identity) {
-		/* TODO */
+	public void identityRemoved(OwnIdentity ownIdentity, Identity identity) {
+		trustedIdentities.get(ownIdentity).remove(identity);
 	}
 
 }