X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetStatusAjaxPage.java;h=4c61f89b0a4ccff9d10f0ee8ecc68ec1294c3259;hp=223a79f257747e82936eb57a41824d91d1eef635;hb=5723a2bb28376b0972a63bae2124846116cf6ca5;hpb=50ce65f69e49ed10abeedaeb6615ffb37a0c0772

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
index 223a79f..4c61f89 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java
@@ -66,19 +66,14 @@ public class GetStatusAjaxPage extends JsonPage {
 	@Override
 	protected JsonObject createJsonObject(FreenetRequest request) {
 		final Sone currentSone = getCurrentSone(request.getToadletContext(), false);
-		/* load Sones. */
-		boolean loadAllSones = Boolean.parseBoolean(request.getHttpRequest().getParam("loadAllSones", "false"));
+		/* load Sones. always return the status of the current Sone. */
 		Set<Sone> sones = new HashSet<Sone>(Collections.singleton(getCurrentSone(request.getToadletContext(), false)));
-		if (loadAllSones) {
-			sones.addAll(webInterface.getCore().getSones());
-		} else {
-			String loadSoneIds = request.getHttpRequest().getParam("soneIds");
-			if (loadSoneIds.length() > 0) {
-				String[] soneIds = loadSoneIds.split(",");
-				for (String soneId : soneIds) {
-					/* just add it, we skip null further down. */
-					sones.add(webInterface.getCore().getSone(soneId, false));
-				}
+		String loadSoneIds = request.getHttpRequest().getParam("soneIds");
+		if (loadSoneIds.length() > 0) {
+			String[] soneIds = loadSoneIds.split(",");
+			for (String soneId : soneIds) {
+				/* just add it, we skip null further down. */
+				sones.add(webInterface.getCore().getSone(soneId, false));
 			}
 		}
 		JsonArray jsonSones = new JsonArray();
@@ -198,7 +193,7 @@ public class GetStatusAjaxPage 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());