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=7ee2005f0b293d3a088cf6c9dfb812c39f143f25;hp=4e731e87e44bce0b84617a451541cb0482edbdbe;hb=3da1daa6488c642430858a4baacc0aa986a6ebc1;hpb=9f562b1024a26cd8841447c6e29c3d89039d7a22 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 4e731e8..7ee2005 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java @@ -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 = 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(); }