Return local Sones from core and web interface.

[Sone.git] / src / main / java / net / pterodactylus / sone / web / ajax / UnlockSoneAjaxPage.java

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 14cb10d..8384e85 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - UnlockSoneAjaxPage.java - Copyright © 2010–2012 David Roden
+ * Sone - UnlockSoneAjaxPage.java - Copyright © 2010–2013 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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> localSone = webInterface.getCore().getLocalSone(soneId);
+               if (!localSone.isPresent()) {
                        return createErrorJsonObject("invalid-sone-id");
                }
-               webInterface.getCore().unlockSone(sone);
+               webInterface.getCore().unlockSone(localSone.get());
                return createSuccessJsonObject();
        }