Don’t allow changing an image’s title into an empty string.

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

diff --git a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
index b7e9e93..b5e8d51 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
+++ b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
@@ -31,6 +31,7 @@ import javax.imageio.ImageReader;
 import javax.imageio.stream.ImageInputStream;
 
 import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.ImageImpl.ImageTitleMustNotBeEmpty;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.TemporaryImage;
 import net.pterodactylus.sone.text.TextFilter;
@@ -83,12 +84,10 @@ public class UploadImagePage extends SoneTemplatePage {
                        String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
                        Album parent = webInterface.getCore().getAlbum(parentId);
                        if (parent == null) {
-                               /* TODO - signal error */
-                               return;
+                               throw new RedirectException("noPermission.html");
                        }
                        if (!currentSone.equals(parent.getSone())) {
-                               /* TODO - signal error. */
-                               return;
+                               throw new RedirectException("noPermission.html");
                        }
                        String name = request.getHttpRequest().getPartAsStringFailsafe("title", 200);
                        String description = request.getHttpRequest().getPartAsStringFailsafe("description", 4000);
@@ -126,6 +125,8 @@ public class UploadImagePage extends SoneTemplatePage {
                        } catch (IOException ioe1) {
                                logger.log(Level.WARNING, "Could not read uploaded image!", ioe1);
                                return;
+                       } catch (ImageTitleMustNotBeEmpty itmnbe) {
+                               throw new RedirectException("emptyImageTitle.html");
                        } finally {
                                Closer.close(imageDataInputStream);
                                Closer.flush(uploadedImage);