X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSoneImpl.java;h=341746bb9a8dbb21daaf85553fd4bef219b2ff42;hb=a53c79c7e0876cf7f269341830b763165e129f4a;hp=08c104fc83a7687a2294ada1e68bc9b4e6a2f169;hpb=210684b4bc499e298a0d0abeddd4008cdeb406bc;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/SoneImpl.java b/src/main/java/net/pterodactylus/sone/data/SoneImpl.java
index 08c104f..341746b 100644
--- a/src/main/java/net/pterodactylus/sone/data/SoneImpl.java
+++ b/src/main/java/net/pterodactylus/sone/data/SoneImpl.java
@@ -167,26 +167,17 @@ public class SoneImpl implements Sone {
 	 * @return The request URI of this Sone
 	 */
 	public FreenetURI getRequestUri() {
-		return (requestUri != null) ? requestUri.setSuggestedEdition(latestEdition) : null;
-	}
-
-	/**
-	 * Sets the request URI of this Sone.
-	 *
-	 * @param requestUri
-	 * 		The request URI of this Sone
-	 * @return This Sone (for method chaining)
-	 */
-	public Sone setRequestUri(FreenetURI requestUri) {
-		if (this.requestUri == null) {
-			this.requestUri = requestUri.setKeyType("USK").setDocName("Sone").setMetaString(new String[0]);
-			return this;
-		}
-		if (!this.requestUri.equalsKeypair(requestUri)) {
-			logger.log(Level.WARNING, String.format("Request URI %s tried to overwrite %s!", requestUri, this.requestUri));
-			return this;
+		try {
+			return new FreenetURI(getIdentity().getRequestUri())
+					.setKeyType("USK")
+					.setDocName("Sone")
+					.setMetaString(new String[0])
+					.setSuggestedEdition(latestEdition);
+		} catch (MalformedURLException e) {
+			throw new IllegalStateException(
+					format("Identity %s's request URI is incorrect.",
+							getIdentity()), e);
 		}
-		return this;
 	}
 
 	/**
@@ -199,7 +190,10 @@ public class SoneImpl implements Sone {
 			return null;
 		}
 		try {
-			return new FreenetURI(((OwnIdentity) getIdentity()).getInsertUri()).setDocName("Sone").setMetaString(new String[0]);
+			return new FreenetURI(((OwnIdentity) getIdentity()).getInsertUri())
+					.setDocName("Sone")
+					.setMetaString(new String[0])
+					.setSuggestedEdition(latestEdition);
 		} catch (MalformedURLException e) {
 			throw new IllegalStateException(format("Own identity %s's insert URI is incorrect.", getIdentity()), e);
 		}