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

diff --git a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
index 766f018..969160b 100644
--- a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
@@ -21,6 +21,7 @@ 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;
@@ -34,7 +35,6 @@ 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"));
@@ -97,12 +97,12 @@ public class ImageBrowserPage extends SoneTemplatePage {
 				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;
 		}
-		Sone sone = getCurrentSone(request.getToadletContext(), false);
+		Sone sone = getCurrentSone(request.getToadletContext(), false).get();
 		templateContext.set("soneRequested", true);
 		templateContext.set("sone", sone);
 	}