X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=91a04d3ba2c0d366bb373d5dff9b74d6cdb65654;hb=93bcc92cdf6a44b32ee7bd6ff6b48624ec9589d1;hp=f8cee114f174cc3e01903936ed47d89193aea045;hpb=3c255a88f7580334bb7941493a3be2ba08c82bfe;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index f8cee11..91a04d3 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -1892,6 +1892,24 @@ public class Core implements IdentityListener, UpdateListener, ImageInsertListen
 	}
 
 	/**
+	 * Deletes the given image. This method will also delete a matching
+	 * temporary image.
+	 *
+	 * @see #deleteTemporaryImage(TemporaryImage)
+	 * @param image
+	 *            The image to delete
+	 */
+	public void deleteImage(Image image) {
+		Validation.begin().isNotNull("Image", image).check().is("Local Sone", isLocalSone(image.getSone())).check();
+		image.getAlbum().removeImage(image);
+		synchronized (images) {
+			images.remove(image.getId());
+		}
+		deleteTemporaryImage(image.getId());
+		saveSone(image.getSone());
+	}
+
+	/**
 	 * Creates a new temporary image.
 	 *
 	 * @param mimeType
@@ -1931,6 +1949,10 @@ public class Core implements IdentityListener, UpdateListener, ImageInsertListen
 		synchronized (temporaryImages) {
 			temporaryImages.remove(imageId);
 		}
+		Image image = getImage(imageId, false);
+		if (image != null) {
+			imageInserter.cancelImageInsert(image);
+		}
 	}
 
 	/**