X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fwotns%2Fmain%2FResolver.java;h=63123b226783fc091c29844b4019d117aba92668;hb=ea56d844aa370dc77d071a425243af6aa6a04ac6;hp=f623e3d500ef53ec9f75e0b69e4df072e489d9db;hpb=3f2225f7c39c7d2f0a7b320fbb5e93815c0d9661;p=WoTNS.git

diff --git a/src/main/java/net/pterodactylus/wotns/main/Resolver.java b/src/main/java/net/pterodactylus/wotns/main/Resolver.java
index f623e3d..63123b2 100644
--- a/src/main/java/net/pterodactylus/wotns/main/Resolver.java
+++ b/src/main/java/net/pterodactylus/wotns/main/Resolver.java
@@ -23,8 +23,11 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
-import net.pterodactylus.util.collection.Default;
+import net.pterodactylus.util.logging.Logging;
+import net.pterodactylus.util.object.Default;
 import net.pterodactylus.wotns.freenet.wot.Identity;
 import net.pterodactylus.wotns.freenet.wot.IdentityManager;
 import net.pterodactylus.wotns.freenet.wot.OwnIdentity;
@@ -38,6 +41,8 @@ import freenet.keys.FreenetURI;
  */
 public class Resolver {
 
+	private static final Logger logger = Logging.getLogger(Resolver.class);
+
 	private final IdentityManager identityManager;
 
 	private String ownIdentityId;
@@ -46,6 +51,10 @@ public class Resolver {
 		this.identityManager = identityManager;
 	}
 
+	public String getOwnIdentityId() {
+		return ownIdentityId;
+	}
+
 	public void setOwnIdentityId(String ownIdentityId) {
 		this.ownIdentityId = ownIdentityId;
 	}
@@ -83,7 +92,9 @@ public class Resolver {
 		}
 		@SuppressWarnings("hiding")
 		final OwnIdentity ownIdentity;
-		if (this.ownIdentityId == null) {
+		if ((this.ownIdentityId != null) && (identityManager.getOwnIdentity(this.ownIdentityId) != null)) {
+			ownIdentity = identityManager.getOwnIdentity(this.ownIdentityId);
+		} else if (this.ownIdentityId == null) {
 			Set<OwnIdentity> ownIdentities = identityManager.getAllOwnIdentities();
 			if (!ownIdentities.isEmpty()) {
 				ownIdentity = ownIdentities.iterator().next();
@@ -91,13 +102,14 @@ public class Resolver {
 				ownIdentity = null;
 			}
 		} else {
-			ownIdentity = identityManager.getOwnIdentity(ownIdentityId);
+			logger.log(Level.SEVERE, "Can not resolve “" + shortName + "” without a Web of Trust Identity!");
+			ownIdentity = null;
 		}
 		if (ownIdentity == null) {
 			return null;
 		}
 		System.out.println("using own identity " + ownIdentity + " to resolve " + shortName);
-		Set<Identity> trustedIdentities = Default.forNull(identityManager.getTrustedIdentities(ownIdentity), Collections.<Identity>emptySet());
+		Set<Identity> trustedIdentities = Default.forNull(identityManager.getTrustedIdentities(ownIdentity), Collections.<Identity> emptySet());
 		List<Identity> matchingIdentities = new ArrayList<Identity>();
 		System.out.println("checking " + trustedIdentities);
 		for (Identity identity : trustedIdentities) {