X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FUntrustPage.java;h=294fff2f4ba091695f1488ecc926fe77b96f86a5;hb=2e03e9dddbea4b81aacaf1aa316f5c3ccffd4bf9;hp=d711525bac5376f6a26a1614468349caf91e53d8;hpb=0df5e91852f737d760c5a9f54c5667309fbadcc2;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/UntrustPage.java b/src/main/java/net/pterodactylus/sone/web/UntrustPage.java
index d711525..294fff2 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–2013 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
@@ -24,6 +24,8 @@ import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 import net.pterodactylus.util.web.Method;
 
+import com.google.common.base.Optional;
+
 /**
  * Page that lets the user untrust another Sone. This will remove all trust
  * assignments for an identity.
@@ -49,9 +51,6 @@ public class UntrustPage extends SoneTemplatePage {
 	// SONETEMPLATEPAGE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
@@ -59,9 +58,9 @@ public class UntrustPage extends SoneTemplatePage {
 			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);
 		}