/*
- * Sone - FreenetInterface.java - Copyright © 2010–2016 David Roden
+ * Sone - FreenetInterface.java - Copyright © 2010–2019 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
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>());
};
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);
}
* 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);