X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=5a91f79d7817aa27ba00339ff787295e25397a85;hb=67a8ddd9cdd9ba3d08e1022ab8a5c3b5e1326324;hp=7dc398e62ba18fe8b0d86ccd49001b1052690cbd;hpb=13b6e1517335f9e1bcf883ddd6f27fde95ce551b;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 7dc398e..5a91f79 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -525,7 +525,8 @@ public class Core implements IdentityListener, UpdateListener {
 	 * @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);
+		Validation.begin().isNotNull("Origin", origin).isNotNull("Target", target).check().isInstanceOf("Origin’s OwnIdentity", origin.getIdentity(), OwnIdentity.class).check();
+		return trustedIdentities.containsKey(origin.getIdentity()) && trustedIdentities.get(origin.getIdentity()).contains(target.getIdentity());
 	}
 
 	/**
@@ -817,7 +818,6 @@ public class Core implements IdentityListener, UpdateListener {
 				@SuppressWarnings("synthetic-access")
 				public void run() {
 					if (!preferences.isSoneRescueMode()) {
-						soneDownloader.fetchSone(sone);
 						return;
 					}
 					logger.log(Level.INFO, "Trying to restore Sone from Freenet…");