Rework pretty much all image displaying code

[Sone.git] / src / main / java / net / pterodactylus / sone / web / ImageBrowserPage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
index 60b22d5..58aee5c 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
@@ -65,14 +65,14 @@ public class ImageBrowserPage extends SoneTemplatePage {
         * {@inheritDoc}
         */
        @Override
-       protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
-               super.processTemplate(request, templateContext);
+       protected void processSonePage(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
                String albumId = request.getHttpRequest().getParam("album", null);
                if (albumId != null) {
-                       Album album = webInterface.getCore().getAlbum(albumId);
+                       Optional<Album> album = webInterface.getCore().getAlbum(albumId);
                        templateContext.set("albumRequested", true);
-                       templateContext.set("album", album);
+                       templateContext.set("album", album.orNull());
                        templateContext.set("page", request.getHttpRequest().getParam("page"));
+                       templateContext.set("albumPage", request.getHttpRequest().getParam("albumPage"));
                        return;
                }
                String imageId = request.getHttpRequest().getParam("image", null);
@@ -87,6 +87,7 @@ public class ImageBrowserPage extends SoneTemplatePage {
                        Optional<Sone> sone = webInterface.getCore().getSone(soneId);
                        templateContext.set("soneRequested", true);
                        templateContext.set("sone", sone.orNull());
+                       templateContext.set("albumPage", request.getHttpRequest().getParam("albumPage"));
                        return;
                }
                String mode = request.getHttpRequest().getParam("mode", null);