X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FUntrustAjaxPage.java;h=5ba66934600649013b13932fa7beefe4bcc8580c;hb=c141e4c4a691323f83c209ffa0df927e989aa2ce;hp=65d45c9e3047f06d4434a8beeb41dbe73dd4c948;hpb=45803a1c678d6811f7bbf85d50c79844031be0f0;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java
index 65d45c9..5ba6693 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java
@@ -1,5 +1,5 @@
/*
- * Sone - UntrustAjaxPage.java - Copyright © 2011â2013 David Roden
+ * Sone - UntrustAjaxPage.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 untrust a Sone.
@@ -31,7 +32,7 @@ import net.pterodactylus.util.json.JsonObject;
* @see Core#untrustSone(Sone, Sone)
* @author David âBombeâ Roden
*/
-public class UntrustAjaxPage extends JsonPage {
+public class UntrustAjaxPage extends LoggedInJsonPage {
/**
* Creates a new âuntrust Soneâ AJAX handler.
@@ -46,12 +47,9 @@ public class UntrustAjaxPage 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()) {