import freenet.client.async.ClientPutter;
import freenet.client.async.SnoopMetadata;
import freenet.client.async.USKCallback;
+import freenet.client.async.USKManager;
import freenet.keys.FreenetURI;
import freenet.keys.InsertableClientSSK;
import freenet.keys.USK;
/** The node to interact with. */
private final Node node;
+ private final USKManager uskManager;
+ private final ClientContext clientContext;
private final SoneUriCreator soneUriCreator;
private final RequestClient imageLoader = new RequestClientBuilder().realTime().build();
@Inject
- public FreenetInterface(EventBus eventBus, Node node, SoneUriCreator soneUriCreator) {
+ public FreenetInterface(EventBus eventBus, Node node, USKManager uskManager, ClientContext clientContext, SoneUriCreator soneUriCreator, HighLevelSimpleClientCreator highLevelSimpleClientCreator) {
this.eventBus = eventBus;
this.node = node;
+ this.uskManager = uskManager;
+ this.clientContext = clientContext;
this.soneUriCreator = soneUriCreator;
- this.client = node.clientCore.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS, false, true);
+ this.client = highLevelSimpleClientCreator.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS, false, true);
}
//
SnoopMetadata snoop = new SnoopMetadata() {
@Override
public boolean snoopMetadata(Metadata meta, ClientContext context) {
+ if (meta.isArchiveManifest()) {
+ return false;
+ }
String mimeType = meta.getMIMEType();
boolean cancel = (mimeType == null) || backgroundFetchCallback.shouldCancel(uri, mimeType, meta.dataLength());
if (cancel) {
}
};
FetchContext fetchContext = client.getFetchContext();
+ fetchContext.dontEnterImplicitArchives = false;
try {
ClientGetter clientGetter = client.fetch(uri, 2097152, callback, fetchContext, RequestStarter.INTERACTIVE_PRIORITY_CLASS);
clientGetter.setMetaSnoop(snoop);
- clientGetter.restart(uri, fetchContext.filterData, node.clientCore.clientContext);
+ clientGetter.restart(uri, fetchContext.filterData, clientContext);
} catch (FetchException fe) {
/* stupid exception that can not actually be thrown! */
}
USKCallback uskCallback) {
try {
soneUskCallbacks.put(FreenetURIsKt.getRoutingKeyString(requestUri), uskCallback);
- node.clientCore.uskManager.subscribe(create(requestUri),
+ uskManager.subscribe(create(requestUri),
uskCallback, true, requestClient);
} catch (MalformedURLException mue1) {
logger.log(WARNING, format("Could not subscribe USK β%sβ!",
USKCallback uskCallback) {
try {
soneUskCallbacks.put(FreenetURIsKt.getRoutingKeyString(requestUri), uskCallback);
- node.clientCore
- .uskManager
- .subscribe(create(requestUri), uskCallback, false, requestClient);
+ uskManager.subscribe(create(requestUri), uskCallback, false, requestClient);
} catch (MalformedURLException mue1) {
logger.log(WARNING,
format("Could not subscribe USK β%sβ!", requestUri),
logger.log(Level.FINEST, String.format("USKs left: %d", soneUskCallbacks.size()));
uskCallbacks.forEach(uskCallback -> {
try {
- node.clientCore.uskManager.unsubscribe(USK.create(soneUriCreator.getRequestUri(sone)), uskCallback);
+ uskManager.unsubscribe(USK.create(soneUriCreator.getRequestUri(sone)), uskCallback);
} catch (MalformedURLException mue1) {
logger.log(Level.FINE, String.format("Could not unsubscribe USK β%sβ!", soneUriCreator.getRequestUri(sone)), mue1);
}
};
try {
- node.clientCore.uskManager.subscribe(USK.create(uri), uskCallback, true, requestClient);
+ uskManager.subscribe(USK.create(uri), uskCallback, true, requestClient);
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);
logger.log(Level.INFO, String.format("Could not unregister unknown USK: %s", uri));
return;
}
- node.clientCore.uskManager.unsubscribe(USK.create(uri), uskCallback);
+ uskManager.unsubscribe(USK.create(uri), uskCallback);
} catch (MalformedURLException mue1) {
logger.log(Level.INFO, String.format("Could not unregister invalid USK: %s", uri), mue1);
}
*/
@SuppressWarnings("synthetic-access")
public void cancel() {
- clientPutter.cancel(node.clientCore.clientContext);
+ clientPutter.cancel(clientContext);
eventBus.post(new ImageInsertAbortedEvent(image));
bucket.free();
}