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=28c8e22b8b0062986dc5150a4820bd666e30aad9;hb=HEAD;hpb=b1f3c46e6c76d216b70733c334642f87187676a9

diff --git a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
index 28c8e22..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–2019 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
@@ -91,6 +91,8 @@ 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();
@@ -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);
 	}
 
@@ -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);
 		}
 	}