X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FUnlockSoneAjaxPage.java;h=3756ebb7eb686ce6e2f981f897f1fad9caefd52c;hb=2e03e9dddbea4b81aacaf1aa316f5c3ccffd4bf9;hp=f92132d7410b879860fd95ce9877eb469c4a5bdf;hpb=9fbafff8f3467329e7c8ad24d5d13273962ade28;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 f92132d..3756ebb 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.java @@ -22,6 +22,8 @@ import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.sone.web.page.FreenetRequest; +import com.google.common.base.Optional; + /** * Lets the user {@link Core#unlockSone(Sone) unlock} a {@link Sone}. * @@ -39,23 +41,17 @@ public class UnlockSoneAjaxPage extends JsonPage { super("unlockSone.ajax", webInterface); } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String soneId = request.getHttpRequest().getParam("sone"); - Sone sone = webInterface.getCore().getLocalSone(soneId, false); - if (sone == null) { + Optional sone = webInterface.getCore().getLocalSone(soneId); + if (!sone.isPresent()) { return createErrorJsonObject("invalid-sone-id"); } - webInterface.getCore().unlockSone(sone); + webInterface.getCore().unlockSone(sone.get()); return createSuccessJsonObject(); } - /** - * {@inheritDoc} - */ @Override protected boolean requiresLogin() { return false;