X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FTrustAjaxPage.java;h=d0247cb4155bf01e4ebb8d55a7e8940451d6b7d1;hb=d142608024302ca4106a70b95daabf27aa5362a4;hp=d03e030ecabc205ad0accd07957b591f9be6fee3;hpb=6f019de1d4d9742981d851ac3c9097cca8bff58e;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/TrustAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/TrustAjaxPage.java
index d03e030..d0247cb 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/TrustAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/TrustAjaxPage.java
@@ -1,5 +1,5 @@
/*
- * Sone - TrustAjaxPage.java - Copyright © 2011â2013 David Roden
+ * Sone - TrustAjaxPage.java - Copyright © 2011â2016 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
@@ -17,13 +17,14 @@
package net.pterodactylus.sone.web.ajax;
+import javax.annotation.Nonnull;
+
import com.google.common.base.Optional;
import net.pterodactylus.sone.core.Core;
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;
/**
* AJAX page that lets the user trust a Sone.
@@ -31,7 +32,7 @@ import net.pterodactylus.util.json.JsonObject;
* @see Core#trustSone(Sone, Sone)
* @author David âBombeâ Roden
*/
-public class TrustAjaxPage extends JsonPage {
+public class TrustAjaxPage extends LoggedInJsonPage {
/**
* Creates a new âtrust Soneâ AJAX handler.
@@ -46,12 +47,9 @@ public class TrustAjaxPage extends JsonPage {
/**
* {@inheritDoc}
*/
+ @Nonnull
@Override
- protected JsonObject createJsonObject(FreenetRequest request) {
- Sone currentSone = getCurrentSone(request.getToadletContext(), false);
- if (currentSone == null) {
- return createErrorJsonObject("auth-required");
- }
+ protected JsonReturnObject createJsonObject(@Nonnull Sone currentSone, @Nonnull FreenetRequest request) {
String soneId = request.getHttpRequest().getParam("sone");
Optional sone = webInterface.getCore().getSone(soneId);
if (!sone.isPresent()) {