X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=86f2c59193969fd8acf7ff501207d87c58c95c87;hb=0491a2dcdc6e6a8021ba9594b1786bdbc8622760;hp=88bef2cd0da494c390cb62d3c430f99e2d156a0a;hpb=c06b0a6bc5e67e6cb5564631d5cc0e3a0dd57eb0;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/Album.java b/src/main/java/net/pterodactylus/sone/data/Album.java
index 88bef2c..86f2c59 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -103,7 +103,7 @@ public class Album implements Fingerprintable {
 	 * @return This album
 	 */
 	public Album setSone(Sone sone) {
-		Validation.begin().isNull("Current Album Owner", this.sone).isNotNull("New Album Owner", sone).check();
+		Validation.begin().isNotNull("New Album Owner", sone).check();
 		this.sone = sone;
 		return this;
 	}
@@ -187,6 +187,15 @@ public class Album implements Fingerprintable {
 	}
 
 	/**
+	 * Returns whether this album contains any other albums or images.
+	 *
+	 * @return {@code true} if this album is empty, {@code false} otherwise
+	 */
+	public boolean isEmpty() {
+		return albums.isEmpty() && images.isEmpty();
+	}
+
+	/**
 	 * Returns the parent album of this album.
 	 *
 	 * @return The parent album of this album, or {@code null} if this album
@@ -289,7 +298,9 @@ public class Album implements Fingerprintable {
 		/* add images. */
 		fingerprint.append("Images(");
 		for (Image image : images) {
-			fingerprint.append(image.getFingerprint());
+			if (image.isInserted()) {
+				fingerprint.append(image.getFingerprint());
+			}
 		}
 		fingerprint.append(')');