X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FCreateAlbumPage.java;h=a8ee6788567dd98303cf23dc82141ad7e3fa293c;hb=53a71d1d6b91e4d56af49a06f2e06bc4d11bf3eb;hp=a8d024a8d69bc78b7bb39c8c88db0f50aa986287;hpb=f4f5fb752ff9aff0235a907e170c6961576562f6;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
index a8d024a..a8ee678 100644
--- a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
@@ -18,6 +18,7 @@
 package net.pterodactylus.sone.web;
 
 import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.text.TextFilter;
 import net.pterodactylus.sone.web.page.FreenetRequest;
@@ -61,14 +62,18 @@ public class CreateAlbumPage extends SoneTemplatePage {
 				return;
 			}
 			String description = request.getHttpRequest().getPartAsStringFailsafe("description", 256).trim();
-			Sone currentSone = getCurrentSone(request.getToadletContext());
+			Sone currentSone = getCurrentSone(request.getToadletContext()).get();
 			String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
-			Album parent = webInterface.getCore().getAlbum(parentId, false);
+			Album parent = webInterface.getCore().getAlbum(parentId);
 			if (parentId.equals("")) {
 				parent = currentSone.getRootAlbum();
 			}
 			Album album = webInterface.getCore().createAlbum(currentSone, parent);
-			album.modify().setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
+			try {
+				album.modify().setTitle(name).setDescription(TextFilter.filter(request.getHttpRequest().getHeader("host"), description)).update();
+			} catch (AlbumTitleMustNotBeEmpty atmnbe) {
+				throw new RedirectException("emptyAlbumTitle.html");
+			}
 			webInterface.getCore().touchConfiguration();
 			throw new RedirectException("imageBrowser.html?album=" + album.getId());
 		}