X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneRescuer.java;h=173a67e4e18d22c2d6e01ea16bf332f7be32a839;hb=b26783f7cdca8c6258c70bef0523758d11c21707;hp=e28f49dc3ddddb97a71c3639efa0013fcf55339f;hpb=d35ab97a494fd187d3b8fe6b3253b65e3427a077;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/core/SoneRescuer.java b/src/main/java/net/pterodactylus/sone/core/SoneRescuer.java index e28f49d..173a67e 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneRescuer.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneRescuer.java @@ -21,11 +21,8 @@ import static net.pterodactylus.sone.data.Sone.TO_FREENET_URI; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.util.service.AbstractService; - import freenet.keys.FreenetURI; -import com.google.common.base.Optional; - /** * The Sone rescuer downloads older editions of a Sone and updates the currently * stored Sone with it. @@ -161,11 +158,11 @@ public class SoneRescuer extends AbstractService { core.lockSone(sone); FreenetURI soneUri = TO_FREENET_URI.apply(sone).setKeyType("SSK").setDocName("Sone-" + currentEdition).setMetaString(new String[] { "sone.xml" }); System.out.println("URI: " + soneUri); - Optional fetchedSone = soneDownloader.fetchSone(sone, soneUri, true); + Sone fetchedSone = soneDownloader.fetchSone(sone, soneUri, true); System.out.println("Sone: " + fetchedSone); - lastFetchSuccessful = fetchedSone.isPresent(); + lastFetchSuccessful = (fetchedSone != null); if (lastFetchSuccessful) { - core.updateSone(fetchedSone.get(), true); + core.updateSone(fetchedSone, true); } fetching = false; }