X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FDismissNotificationPage.java;h=24b6aaa369a941fbc0f6b52b0bd55fac40220874;hb=3da1daa6488c642430858a4baacc0aa986a6ebc1;hp=15c56750dedfc4dbf60bc42ae373906d493f2b15;hpb=ecf753a31601e558b681daab0598009fe9eec99a;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 15c5675..24b6aaa 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–2015 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,13 @@
 
 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.
  *
@@ -48,12 +51,12 @@ public class DismissNotificationPage extends SoneTemplatePage {
 	 * {@inheritDoc}
 	 */
 	@Override
-	protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
+	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
 		String notificationId = request.getHttpRequest().getPartAsStringFailsafe("notification", 36);
-		Notification notification = webInterface.getNotifications().getNotification(notificationId);
-		if ((notification != null) && notification.isDismissable()) {
-			notification.dismiss();
+		Optional<Notification> notification = webInterface.getNotification(notificationId);
+		if (notification.isPresent() && notification.get().isDismissable()) {
+			notification.get().dismiss();
 		}
 		String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
 		throw new RedirectException(returnPage);