X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FUnlockSoneAjaxPage.java;h=8384e857195a9fc5d34a4faa85cc35303256e01f;hb=fd88107b013522d7620f5297386472206f320e10;hp=32bb93c2fc49c5b4aa79202bbeacac8efb3f77ee;hpb=6f019de1d4d9742981d851ac3c9097cca8bff58e;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.java index 32bb93c..8384e85 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.java @@ -18,10 +18,12 @@ package net.pterodactylus.sone.web.ajax; import net.pterodactylus.sone.core.Core; +import net.pterodactylus.sone.data.LocalSone; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.sone.web.page.FreenetRequest; -import net.pterodactylus.util.json.JsonObject; + +import com.google.common.base.Optional; /** * Lets the user {@link Core#unlockSone(Sone) unlock} a {@link Sone}. @@ -44,13 +46,13 @@ public class UnlockSoneAjaxPage extends JsonPage { * {@inheritDoc} */ @Override - protected JsonObject createJsonObject(FreenetRequest request) { + protected JsonReturnObject createJsonObject(FreenetRequest request) { String soneId = request.getHttpRequest().getParam("sone"); - Sone sone = webInterface.getCore().getLocalSone(soneId, false); - if (sone == null) { + Optional localSone = webInterface.getCore().getLocalSone(soneId); + if (!localSone.isPresent()) { return createErrorJsonObject("invalid-sone-id"); } - webInterface.getCore().unlockSone(sone); + webInterface.getCore().unlockSone(localSone.get()); return createSuccessJsonObject(); }