X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=343fe69b5f8a9f6b5ae143a339f07f67f139115d;hb=a6ed1f08b0331a283674795a09f3f6c7377322c7;hp=a67177bafe8968c3fd516a7cc6e5ba63f48430db;hpb=a23c4f218c3adf236d89d5927cae37d6e6e4feda;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 a67177b..343fe69 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -1200,6 +1200,7 @@ public class Core implements IdentityListener, UpdateListener, ImageInsertListen
 					storedSone.setReplies(sone.getReplies());
 					storedSone.setLikePostIds(sone.getLikedPostIds());
 					storedSone.setLikeReplyIds(sone.getLikedReplyIds());
+					storedSone.setAlbums(sone.getAlbums());
 				}
 				storedSone.setLatestEdition(sone.getLatestEdition());
 			}
@@ -1548,16 +1549,7 @@ public class Core implements IdentityListener, UpdateListener, ImageInsertListen
 			configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
 
 			/* save albums. first, collect in a flat structure, top-level first. */
-			List<Album> albums = new ArrayList<Album>();
-			albums.addAll(sone.getAlbums());
-			int lastAlbumIndex = 0;
-			while (lastAlbumIndex < albums.size()) {
-				int previousAlbumCount = albums.size();
-				for (Album album : new ArrayList<Album>(albums.subList(lastAlbumIndex, albums.size()))) {
-					albums.addAll(album.getAlbums());
-				}
-				lastAlbumIndex = previousAlbumCount;
-			}
+			List<Album> albums = Sone.flattenAlbums(sone.getAlbums());
 
 			int albumCounter = 0;
 			for (Album album : albums) {