X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FUntrustAjaxPage.java;h=5ba66934600649013b13932fa7beefe4bcc8580c;hp=916b6e98afd7c359291cdc3f036f38e6ca1f4a26;hb=9e697ac643d11a2b7644a948732674eea195718a;hpb=efb1006429e52a74f41fb6e1d7736736156bb13a

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 916b6e9..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–2012 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,11 +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.
@@ -29,7 +32,7 @@ import net.pterodactylus.util.json.JsonObject;
  * @see Core#untrustSone(Sone, Sone)
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class UntrustAjaxPage extends JsonPage {
+public class UntrustAjaxPage extends LoggedInJsonPage {
 
 	/**
 	 * Creates a new “untrust Sone” AJAX handler.
@@ -44,18 +47,15 @@ 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");
-		Sone sone = webInterface.getCore().getSone(soneId, false);
-		if (sone == null) {
+		Optional<Sone> sone = webInterface.getCore().getSone(soneId);
+		if (!sone.isPresent()) {
 			return createErrorJsonObject("invalid-sone-id");
 		}
-		webInterface.getCore().untrustSone(currentSone, sone);
+		webInterface.getCore().untrustSone(currentSone, sone.get());
 		return createSuccessJsonObject().put("trustValue", (String) null);
 	}