X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetNotificationsAjaxPage.java;h=6573ddacf23b76fb289ca072923aebb3ad0c1ad6;hb=274784c1ae880b7cdc2bb7cf31d75e4092ec5653;hp=d0020ca78ef94313c487a2355f62867c65cc673e;hpb=322bfaef40f5471467e55b979959e8f561b54129;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java
index d0020ca..6573dda 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java
@@ -1,5 +1,5 @@
 /*
- * Sone - GetNotificationsAjaxPage.java - Copyright © 2011 David Roden
+ * Sone - GetNotificationsAjaxPage.java - Copyright © 2011–2013 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
@@ -20,6 +20,7 @@ package net.pterodactylus.sone.web.ajax;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 
 import net.pterodactylus.sone.data.Sone;
@@ -31,7 +32,6 @@ import net.pterodactylus.util.json.JsonArray;
 import net.pterodactylus.util.json.JsonObject;
 import net.pterodactylus.util.notify.Notification;
 import net.pterodactylus.util.notify.TemplateNotification;
-import net.pterodactylus.util.object.HashCode;
 import net.pterodactylus.util.template.TemplateContext;
 
 /**
@@ -79,12 +79,12 @@ public class GetNotificationsAjaxPage extends JsonPage {
 		Sone currentSone = getCurrentSone(request.getToadletContext(), false);
 		Collection<Notification> notifications = webInterface.getNotifications().getNotifications();
 		List<Notification> filteredNotifications = ListNotificationFilters.filterNotifications(notifications, currentSone);
-		int notificationHash = HashCode.hashCode(filteredNotifications);
+		Collections.sort(filteredNotifications, Notification.CREATED_TIME_SORTER);
 		JsonArray jsonNotifications = new JsonArray();
 		for (Notification notification : filteredNotifications) {
 			jsonNotifications.add(createJsonNotification(request, notification));
 		}
-		return createSuccessJsonObject().put("notificationHash", notificationHash).put("notifications", jsonNotifications).put("options", createJsonOptions(currentSone));
+		return createSuccessJsonObject().put("notificationHash", filteredNotifications.hashCode()).put("notifications", jsonNotifications).put("options", createJsonOptions(currentSone));
 	}
 
 	//
@@ -140,7 +140,7 @@ public class GetNotificationsAjaxPage extends JsonPage {
 	 *            The current Sone (may be {@code null})
 	 * @return The current options
 	 */
-	private JsonObject createJsonOptions(Sone currentSone) {
+	private static JsonObject createJsonOptions(Sone currentSone) {
 		JsonObject options = new JsonObject();
 		if (currentSone != null) {
 			options.put("ShowNotification/NewSones", currentSone.getOptions().getBooleanOption("ShowNotification/NewSones").get());