X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=0c8780c14084f9d118e9713ebf1bca3712656106;hb=f855be86d4d02a29c4603522c793a3b0eecc961c;hp=aa14edef2f2f128d9ae5067faaa675736281ac29;hpb=c2e868714435ac7c75d77d1911d0dfb00393d051;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 aa14ede..0c8780c 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -44,7 +44,7 @@ import com.google.common.hash.Hashing;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class Album implements Fingerprintable {
+public class Album implements Identified, Fingerprintable {
 
 	/** Compares two {@link Album}s by {@link #getTitle()}. */
 	public static final Comparator<Album> TITLE_COMPARATOR = new Comparator<Album>() {
@@ -86,11 +86,19 @@ public class Album implements Fingerprintable {
 
 		@Override
 		public boolean apply(Album album) {
+			/* so, we flatten all albums below the given one and check whether at least one album… */
 			return FluentIterable.from(asList(album)).transformAndConcat(FLATTENER).anyMatch(new Predicate<Album>() {
 
 				@Override
 				public boolean apply(Album album) {
-					return !album.getImages().isEmpty();
+					/* …contains any inserted images. */
+					return !album.getImages().isEmpty() && FluentIterable.from(album.getImages()).allMatch(new Predicate<Image>() {
+
+						@Override
+						public boolean apply(Image input) {
+							return input.isInserted();
+						}
+					});
 				}
 			});
 		}