X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FUpdateChecker.java;h=5ccc96dbe9e7f356add7a23b92d9b8a310920b67;hp=3f4d2354e1caf31e15bdc836ba2e61c6645b690d;hb=036c6fa20ce11ce8093f46fc0fce1c1da1839789;hpb=2076d1e91d695ca41a1f925ee42e79f237df7e9c diff --git a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java index 3f4d235..5ccc96d 100644 --- a/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java +++ b/src/main/java/net/pterodactylus/sone/core/UpdateChecker.java @@ -26,12 +26,11 @@ import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; +import net.pterodactylus.sone.core.FreenetInterface.Fetched; import net.pterodactylus.sone.main.SonePlugin; -import net.pterodactylus.util.collection.Pair; import net.pterodactylus.util.io.Closer; import net.pterodactylus.util.logging.Logging; import net.pterodactylus.util.version.Version; -import freenet.client.FetchResult; import freenet.keys.FreenetURI; import freenet.support.api.Bucket; @@ -168,12 +167,12 @@ public class UpdateChecker { public void editionFound(FreenetURI uri, long edition, boolean newKnownGood, boolean newSlot) { logger.log(Level.FINEST, String.format("Found update for %s: %d, %s, %s", uri, edition, newKnownGood, newSlot)); if (newKnownGood || newSlot) { - Pair uriResult = freenetInterface.fetchUri(uri.setMetaString(new String[] { "sone.properties" })); + Fetched uriResult = freenetInterface.fetchUri(uri.setMetaString(new String[] { "sone.properties" })); if (uriResult == null) { logger.log(Level.WARNING, String.format("Could not fetch properties of latest homepage: %s", uri)); return; } - Bucket resultBucket = uriResult.getRight().asBucket(); + Bucket resultBucket = uriResult.getFetchResult().asBucket(); try { parseProperties(resultBucket.getInputStream(), edition); latestEdition = edition;