Remove notification information from “get status” AJAX handler.
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 25 Nov 2011 06:49:31 +0000 (07:49 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Fri, 25 Nov 2011 06:49:31 +0000 (07:49 +0100)
src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java

index 5c9da19..1f23e4a 100644 (file)
@@ -92,11 +92,6 @@ public class GetStatusAjaxPage extends JsonPage {
                /* load notifications. */
                List<Notification> notifications = ListNotificationFilters.filterNotifications(webInterface.getNotifications().getNotifications(), currentSone);
                int notificationHash = HashCode.hashCode(notifications);
-               Collections.sort(notifications, Notification.LAST_UPDATED_TIME_SORTER);
-               JsonArray jsonNotificationInformations = new JsonArray();
-               for (Notification notification : notifications) {
-                       jsonNotificationInformations.add(createJsonNotificationInformation(notification));
-               }
                /* load new posts. */
                Set<Post> newPosts = webInterface.getNewPosts();
                if (currentSone != null) {
@@ -147,7 +142,7 @@ public class GetStatusAjaxPage extends JsonPage {
                        jsonReply.put("postSone", reply.getPost().getSone().getId());
                        jsonReplies.add(jsonReply);
                }
-               return createSuccessJsonObject().put("loggedIn", currentSone != null).put("options", createJsonOptions(currentSone)).put("sones", jsonSones).put("notificationHash", notificationHash).put("notifications", jsonNotificationInformations).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
+               return createSuccessJsonObject().put("loggedIn", currentSone != null).put("options", createJsonOptions(currentSone)).put("sones", jsonSones).put("notificationHash", notificationHash).put("newPosts", jsonPosts).put("newReplies", jsonReplies);
        }
 
        /**
@@ -194,24 +189,6 @@ public class GetStatusAjaxPage extends JsonPage {
        }
 
        /**
-        * Creates a JSON object that only contains the ID and the last-updated time
-        * of the given notification.
-        *
-        * @see Notification#getId()
-        * @see Notification#getLastUpdatedTime()
-        * @param notification
-        *            The notification
-        * @return A JSON object containing the notification ID and last-updated
-        *         time
-        */
-       private JsonObject createJsonNotificationInformation(Notification notification) {
-               JsonObject jsonNotification = new JsonObject();
-               jsonNotification.put("id", notification.getId());
-               jsonNotification.put("lastUpdatedTime", notification.getLastUpdatedTime());
-               return jsonNotification;
-       }
-
-       /**
         * Creates a JSON object that contains all options that are currently in
         * effect for the given Sone (or overall, if the given Sone is {@code null}
         * ).