Store albums from parsed Sone in stored Sone.

[Sone.git] / src / main / java / net / pterodactylus / sone / core / Core.java

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 (file)
--- 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) {