X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FImageBrowserPage.java;h=60b22d5731ab9211a4cf26730d1648295230e0cd;hp=9dec1dce16bfadd8e61223610239639db7f54c2c;hb=0e8f7804ce344bdd69f5ecc7febe25a60a53561d;hpb=c9a7798a840281a865f8b776d1518563a55485d8

diff --git a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
index 9dec1dc..60b22d5 100644
--- a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
@@ -17,9 +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 static net.pterodactylus.sone.utils.NumberParsers.parseInt;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -27,14 +29,12 @@ import java.util.Collections;
 import java.util.List;
 
 import com.google.common.base.Optional;
-import com.google.common.collect.FluentIterable;
 
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Image;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.web.page.FreenetRequest;
 import net.pterodactylus.util.collection.Pagination;
-import net.pterodactylus.util.number.Numbers;
 import net.pterodactylus.util.template.Template;
 import net.pterodactylus.util.template.TemplateContext;
 
@@ -69,7 +69,7 @@ public class ImageBrowserPage extends SoneTemplatePage {
 		super.processTemplate(request, templateContext);
 		String albumId = request.getHttpRequest().getParam("album", null);
 		if (albumId != null) {
-			Album album = webInterface.getCore().getAlbum(albumId, false);
+			Album album = webInterface.getCore().getAlbum(albumId);
 			templateContext.set("albumRequested", true);
 			templateContext.set("album", album);
 			templateContext.set("page", request.getHttpRequest().getParam("page"));
@@ -94,10 +94,10 @@ public class ImageBrowserPage extends SoneTemplatePage {
 			templateContext.set("galleryRequested", true);
 			List<Album> albums = new ArrayList<Album>();
 			for (Sone sone : webInterface.getCore().getSones()) {
-				albums.addAll(FluentIterable.from(sone.getAlbums()).transformAndConcat(FLATTENER).filter(NOT_EMPTY).toList());
+				albums.addAll(from(sone.getRootAlbum().getAlbums()).transformAndConcat(FLATTENER).filter(NOT_EMPTY).toList());
 			}
 			Collections.sort(albums, TITLE_COMPARATOR);
-			Pagination<Album> albumPagination = new Pagination<Album>(albums, 12).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0));
+			Pagination<Album> albumPagination = new Pagination<Album>(albums, 12).setPage(parseInt(request.getHttpRequest().getParam("page"), 0));
 			templateContext.set("albumPagination", albumPagination);
 			templateContext.set("albums", albumPagination.getItems());
 			return;