X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUntrustPage.java;h=cba36353c9c167428a92e92e4c22606557a7834a;hp=d711525bac5376f6a26a1614468349caf91e53d8;hb=9acbc5bdec4ccb752e0856a501568b0bb6161579;hpb=45f92ec63dbf8134d92ceed67294faa38117b195

diff --git a/src/main/java/net/pterodactylus/sone/web/UntrustPage.java b/src/main/java/net/pterodactylus/sone/web/UntrustPage.java
index d711525..cba3635 100644
--- a/src/main/java/net/pterodactylus/sone/web/UntrustPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/UntrustPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - UntrustPage.java - Copyright © 2011 David Roden
+ * Sone - UntrustPage.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,6 +17,8 @@
 
 package net.pterodactylus.sone.web;
 
+import com.google.common.base.Optional;
+
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.page.FreenetRequest;
@@ -53,15 +55,14 @@ public class UntrustPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-		super.processTemplate(request, templateContext);
+	protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		if (request.getMethod() == Method.POST) {
 			String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
 			String identity = request.getHttpRequest().getPartAsStringFailsafe("sone", 44);
 			Sone currentSone = getCurrentSone(request.getToadletContext());
-			Sone sone = webInterface.getCore().getSone(identity, false);
-			if (sone != null) {
-				webInterface.getCore().untrustSone(currentSone, sone);
+			Optional<Sone> sone = webInterface.getCore().getSone(identity);
+			if (sone.isPresent()) {
+				webInterface.getCore().untrustSone(currentSone, sone.get());
 			}
 			throw new RedirectException(returnPage);
 		}