X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=5103b7d527afe1b22082cdaf4f50f6de229cc857;hb=629ddb006542df2b671e172d8f544815bbab639b;hp=5018b258b1305d3aa5e37ae323cd871249e89e20;hpb=4850adf910f409f122e3df9cd0be1d0dad9e19e5;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 5018b25..5103b7d 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -1035,13 +1035,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			database.storePostReplies(sone, sone.getReplies());
 			synchronized (albums) {
 				synchronized (images) {
-					for (Album album : storedSone.get().getAlbums()) {
+					for (Album album : storedSone.get().getRootAlbum().getAlbums()) {
 						albums.remove(album.getId());
 						for (Image image : album.getImages()) {
 							images.remove(image.getId());
 						}
 					}
-					for (Album album : sone.getAlbums()) {
+					for (Album album : sone.getRootAlbum().getAlbums()) {
 						albums.put(album.getId(), album);
 						for (Image image : album.getImages()) {
 							images.put(image.getId(), image);
@@ -1054,10 +1054,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				sone.setKnown(storedSone.get().isKnown());
 				sone.setStatus((sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
 				if (sone.isLocal()) {
-					soneInserters.remove(storedSone.get()).stop();
-					SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, sone);
-					soneInserters.put(sone, soneInserter);
-					soneInserter.start();
+					soneInserters.get(storedSone.get()).setSone(sone);
 					touchConfiguration();
 				}
 				sones.put(sone.getId(), sone);
@@ -1322,7 +1319,12 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			for (String friendId : friends) {
 				followSone(sone, friendId);
 			}
-			sone.setAlbums(topLevelAlbums);
+			for (Album album : sone.getRootAlbum().getAlbums()) {
+				sone.getRootAlbum().removeAlbum(album);
+			}
+			for (Album album : topLevelAlbums) {
+				sone.getRootAlbum().addAlbum(album);
+			}
 			soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
 		}
 		synchronized (knownSones) {
@@ -1587,7 +1589,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @return The new album
 	 */
 	public Album createAlbum(Sone sone) {
-		return createAlbum(sone, null);
+		return createAlbum(sone, sone.getRootAlbum());
 	}
 
 	/**
@@ -1606,11 +1608,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			albums.put(album.getId(), album);
 		}
 		album.setSone(sone);
-		if (parent != null) {
-			parent.addAlbum(album);
-		} else {
-			sone.addAlbum(album);
-		}
+		parent.addAlbum(album);
 		return album;
 	}
 
@@ -1627,11 +1625,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		if (!album.isEmpty()) {
 			return;
 		}
-		if (album.getParent() == null) {
-			album.getSone().removeAlbum(album);
-		} else {
-			album.getParent().removeAlbum(album);
-		}
+		album.getParent().removeAlbum(album);
 		synchronized (albums) {
 			albums.remove(album.getId());
 		}
@@ -1886,7 +1880,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
 
 			/* save albums. first, collect in a flat structure, top-level first. */
-			List<Album> albums = FluentIterable.from(sone.getAlbums()).transformAndConcat(Album.FLATTENER).toList();
+			List<Album> albums = FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).toList();
 
 			int albumCounter = 0;
 			for (Album album : albums) {
@@ -1894,7 +1888,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				configuration.getStringValue(albumPrefix + "/ID").setValue(album.getId());
 				configuration.getStringValue(albumPrefix + "/Title").setValue(album.getTitle());
 				configuration.getStringValue(albumPrefix + "/Description").setValue(album.getDescription());
-				configuration.getStringValue(albumPrefix + "/Parent").setValue(album.getParent() == null ? null : album.getParent().getId());
+				configuration.getStringValue(albumPrefix + "/Parent").setValue(album.getParent().equals(sone.getRootAlbum()) ? null : album.getParent().getId());
 				configuration.getStringValue(albumPrefix + "/AlbumImage").setValue(album.getAlbumImage() == null ? null : album.getAlbumImage().getId());
 			}
 			configuration.getStringValue(sonePrefix + "/Albums/" + albumCounter + "/ID").setValue(null);