Merge branch 'release-0.9.6'

[Sone.git] / src / main / java / net / pterodactylus / sone / web / ajax / DismissNotificationAjaxPage.java

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 232cab6..4661851 100644 (file)
--- 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 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
@@ -19,9 +19,10 @@ package net.pterodactylus.sone.web.ajax;
 
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.sone.web.page.FreenetRequest;
-import net.pterodactylus.util.json.JsonObject;
 import net.pterodactylus.util.notify.Notification;
 
+import com.google.common.base.Optional;
+
 /**
  * AJAX page that lets the user dismiss a notification.
  *
@@ -43,16 +44,16 @@ public class DismissNotificationAjaxPage extends JsonPage {
         * {@inheritDoc}
         */
        @Override
-       protected JsonObject createJsonObject(FreenetRequest request) {
+       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();
        }