X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FTrustPage.java;h=5b0bfbbb23ca05553f9718aa9d25bd346557e6a5;hp=ef64d627549e96092ac4d4373ca8e4369510cebd;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=3ff1cdf09693a28719246a9a98a8b908e8c848f7

diff --git a/src/main/java/net/pterodactylus/sone/web/TrustPage.java b/src/main/java/net/pterodactylus/sone/web/TrustPage.java
index ef64d62..5b0bfbb 100644
--- a/src/main/java/net/pterodactylus/sone/web/TrustPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/TrustPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - TrustPage.java - Copyright © 2011 David Roden
+ * Sone - TrustPage.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,10 +17,14 @@
 
 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.Page.Request.Method;
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
+import net.pterodactylus.util.web.Method;
 
 /**
  * Page that lets the user trust another Sone. This will assign a configurable
@@ -51,17 +55,16 @@ public class TrustPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, Template template) throws RedirectException {
-		super.processTemplate(request, template);
+	protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		if (request.getMethod() == Method.POST) {
-			String returnPath = request.getHttpRequest().getPartAsStringFailsafe("returnPath", 256);
+			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().trustSone(currentSone, sone);
+			Optional<Sone> sone = webInterface.getCore().getSone(identity);
+			if (sone.isPresent()) {
+				webInterface.getCore().trustSone(currentSone, sone.get());
 			}
-			throw new RedirectException(returnPath);
+			throw new RedirectException(returnPage);
 		}
 	}