X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FDismissNotificationAjaxPage.java;h=4661851160e16f4d501257e1e3c6d9bf112eca38;hp=aed9cad4856ad70e343867adea117d92e4c9e92b;hb=7b55e0be6a3283e43a9bbab98f82aebdd948eb33;hpb=7017646bf42cb265b6df539bb6def40b91d2f968

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java
index aed9cad..4661851 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - DismissNotificationAjaxPage.java - Copyright © 2010–2013 David Roden
+ * Sone - DismissNotificationAjaxPage.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
@@ -21,6 +21,8 @@ import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.notify.Notification;
 
+import com.google.common.base.Optional;
+
 /**
  * AJAX page that lets the user dismiss a notification.
  *
@@ -44,14 +46,14 @@ public class DismissNotificationAjaxPage extends JsonPage {
 	@Override
 	protected JsonReturnObject createJsonObject(FreenetRequest request) {
 		String notificationId = request.getHttpRequest().getParam("notification");
-		Notification notification = webInterface.getNotifications().getNotification(notificationId);
-		if (notification == null) {
+		Optional<Notification> notification = webInterface.getNotification(notificationId);
+		if (!notification.isPresent()) {
 			return createErrorJsonObject("invalid-notification-id");
 		}
-		if (!notification.isDismissable()) {
+		if (!notification.get().isDismissable()) {
 			return createErrorJsonObject("not-dismissable");
 		}
-		notification.dismiss();
+		notification.get().dismiss();
 		return createSuccessJsonObject();
 	}