X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FFreenetInterface.java;h=35ac6a19f2b883d324ec78d0c5e4d9a2f9bb4680;hp=f2cbec6930992a41dbe1291251e2ffeb62180d5a;hb=HEAD;hpb=2d20ecfaf31c653140e4135c42f8233e001dacb2

diff --git a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
index f2cbec6..35ac6a1 100644
--- a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
+++ b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
@@ -1,5 +1,5 @@
 /*
- * Sone - FreenetInterface.java - Copyright © 2010–2016 David Roden
+ * Sone - FreenetInterface.java - Copyright © 2010–2020 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,6 @@ import static freenet.keys.USK.create;
 import static java.lang.String.format;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
-import static net.pterodactylus.sone.freenet.Key.routingKey;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -75,6 +74,7 @@ import freenet.support.api.Bucket;
 import freenet.support.api.RandomAccessBucket;
 import freenet.support.io.ArrayBucket;
 import freenet.support.io.ResumeFailedException;
+import net.pterodactylus.sone.freenet.*;
 
 /**
  * Contains all necessary functionality for interacting with the Freenet node.
@@ -91,12 +91,14 @@ public class FreenetInterface {
 	/** The node to interact with. */
 	private final Node node;
 
+	private final SoneUriCreator soneUriCreator;
+
 	/** The high-level client to use for requests. */
 	private final HighLevelSimpleClient client;
 	private final RequestClient requestClient = new RequestClientBuilder().realTime().build();
 
 	/** The USK callbacks. */
-	private final Map<String, USKCallback> soneUskCallbacks = new HashMap<String, USKCallback>();
+	private final Map<String, USKCallback> soneUskCallbacks = new HashMap<>();
 
 	/** The not-Sone-related USK callbacks. */
 	private final Map<FreenetURI, USKCallback> uriUskCallbacks = Collections.synchronizedMap(new HashMap<FreenetURI, USKCallback>());
@@ -104,18 +106,11 @@ public class FreenetInterface {
 	private final RequestClient imageInserts = new RequestClientBuilder().realTime().build();
 	private final RequestClient imageLoader = new RequestClientBuilder().realTime().build();
 
-	/**
-	 * Creates a new Freenet interface.
-	 *
-	 * @param eventBus
-	 *            The event bus
-	 * @param node
-	 *            The node to interact with
-	 */
 	@Inject
-	public FreenetInterface(EventBus eventBus, Node node) {
+	public FreenetInterface(EventBus eventBus, Node node, SoneUriCreator soneUriCreator) {
 		this.eventBus = eventBus;
 		this.node = node;
+		this.soneUriCreator = soneUriCreator;
 		this.client = node.clientCore.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS, false, true);
 	}
 
@@ -255,7 +250,7 @@ public class FreenetInterface {
 	public void registerActiveUsk(FreenetURI requestUri,
 			USKCallback uskCallback) {
 		try {
-			soneUskCallbacks.put(routingKey(requestUri), uskCallback);
+			soneUskCallbacks.put(FreenetURIsKt.getRoutingKeyString(requestUri), uskCallback);
 			node.clientCore.uskManager.subscribe(create(requestUri),
 					uskCallback, true, requestClient);
 		} catch (MalformedURLException mue1) {
@@ -267,7 +262,7 @@ public class FreenetInterface {
 	public void registerPassiveUsk(FreenetURI requestUri,
 			USKCallback uskCallback) {
 		try {
-			soneUskCallbacks.put(routingKey(requestUri), uskCallback);
+			soneUskCallbacks.put(FreenetURIsKt.getRoutingKeyString(requestUri), uskCallback);
 			node.clientCore
 					.uskManager
 					.subscribe(create(requestUri), uskCallback, false, requestClient);
@@ -291,9 +286,9 @@ public class FreenetInterface {
 		}
 		try {
 			logger.log(Level.FINEST, String.format("Unsubscribing from USK for %s…", sone));
-			node.clientCore.uskManager.unsubscribe(USK.create(sone.getRequestUri()), uskCallback);
+			node.clientCore.uskManager.unsubscribe(USK.create(soneUriCreator.getRequestUri(sone)), uskCallback);
 		} catch (MalformedURLException mue1) {
-			logger.log(Level.FINE, String.format("Could not unsubscribe USK “%s”!", sone.getRequestUri()), mue1);
+			logger.log(Level.FINE, String.format("Could not unsubscribe USK “%s”!", soneUriCreator.getRequestUri(sone)), mue1);
 		}
 	}
 
@@ -327,7 +322,7 @@ public class FreenetInterface {
 		};
 		try {
 			node.clientCore.uskManager.subscribe(USK.create(uri), uskCallback, true, requestClient);
-			uriUskCallbacks.put(uri, uskCallback);
+			uriUskCallbacks.put(USK.create(uri).clearCopy().getURI(), uskCallback);
 		} catch (MalformedURLException mue1) {
 			logger.log(Level.WARNING, String.format("Could not subscribe to USK: %s", uri), mue1);
 		}
@@ -340,12 +335,12 @@ public class FreenetInterface {
 	 *            The URI to unregister the USK watcher for
 	 */
 	public void unregisterUsk(FreenetURI uri) {
-		USKCallback uskCallback = uriUskCallbacks.remove(uri);
-		if (uskCallback == null) {
-			logger.log(Level.INFO, String.format("Could not unregister unknown USK: %s", uri));
-			return;
-		}
 		try {
+			USKCallback uskCallback = uriUskCallbacks.remove(USK.create(uri).clearCopy().getURI());
+			if (uskCallback == null) {
+				logger.log(Level.INFO, String.format("Could not unregister unknown USK: %s", uri));
+				return;
+			}
 			node.clientCore.uskManager.unsubscribe(USK.create(uri), uskCallback);
 		} catch (MalformedURLException mue1) {
 			logger.log(Level.INFO, String.format("Could not unregister invalid USK: %s", uri), mue1);