X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FImageBrowserPage.java;h=766f018c770f88a46b539587dbbbfa52c3212587;hp=53c22f2574cad4345e49b3f5cfbd18e8e5bde041;hb=c2e868714435ac7c75d77d1911d0dfb00393d051;hpb=45803a1c678d6811f7bbf85d50c79844031be0f0

diff --git a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
index 53c22f2..766f018 100644
--- a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
@@ -17,6 +17,11 @@
 
 package net.pterodactylus.sone.web;
 
+import static com.google.common.collect.FluentIterable.from;
+import static net.pterodactylus.sone.data.Album.FLATTENER;
+import static net.pterodactylus.sone.data.Album.NOT_EMPTY;
+import static net.pterodactylus.sone.data.Album.TITLE_COMPARATOR;
+
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -89,9 +94,9 @@ public class ImageBrowserPage extends SoneTemplatePage {
 			templateContext.set("galleryRequested", true);
 			List<Album> albums = new ArrayList<Album>();
 			for (Sone sone : webInterface.getCore().getSones()) {
-				albums.addAll(sone.getAllAlbums());
+				albums.addAll(from(sone.getRootAlbum().getAlbums()).transformAndConcat(FLATTENER).filter(NOT_EMPTY).toList());
 			}
-			Collections.sort(albums, Album.TITLE_COMPARATOR);
+			Collections.sort(albums, TITLE_COMPARATOR);
 			Pagination<Album> albumPagination = new Pagination<Album>(albums, 12).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0));
 			templateContext.set("albumPagination", albumPagination);
 			templateContext.set("albums", albumPagination.getItems());