X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FDismissNotificationPage.java;h=c14a012b4a466583526fb2f618ae19ad30c7ba33;hb=fe8a83bdb1d644d4d1bf4342feab4c58115409b3;hp=bdbf00816afcfdcc55d1017ba7ea15bada9eac07;hpb=75771a85377be48674caeedca8253c9c3dbdf818;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java b/src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java
index bdbf008..c14a012 100644
--- a/src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - DismissNotificationPage.java - Copyright © 2010 David Roden
+ * Sone - DismissNotificationPage.java - Copyright © 2010–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,8 +17,12 @@
 
 package net.pterodactylus.sone.web;
 
+import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.notify.Notification;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
+
+import com.google.common.base.Optional;
 
 /**
  * Page that lets the user dismiss a notification.
@@ -47,14 +51,13 @@ public class DismissNotificationPage 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 {
 		String notificationId = request.getHttpRequest().getPartAsStringFailsafe("notification", 36);
-		Notification notification = webInterface.getCore().getNotifications().getNotification(notificationId);
-		if ((notification != null) && notification.isDismissable()) {
-			webInterface.getCore().getNotifications().removeNotification(notification);
+		Optional<Notification> notification = webInterface.getNotification(notificationId);
+		if (notification.isPresent() && notification.get().isDismissable()) {
+			notification.get().dismiss();
 		}
-		String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 64);
+		String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
 		throw new RedirectException(returnPage);
 	}