X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=cffc8d930615a23a91df97408862114f4654cb00;hp=e0ee3637a730fdeda087d6e524a25fc4b5cb0743;hb=3d888e800617335535c1a4b2cbac3e02acfdde34;hpb=6f019de1d4d9742981d851ac3c9097cca8bff58e

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index e0ee363..cffc8d9 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -35,6 +35,7 @@ import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Profile;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.data.Sone.SoneStatus;
+import net.pterodactylus.sone.data.SoneImpl;
 import net.pterodactylus.sone.database.PostBuilder;
 import net.pterodactylus.sone.database.PostReplyBuilder;
 import net.pterodactylus.util.io.Closer;
@@ -97,9 +98,10 @@ public class SoneDownloader extends AbstractService {
 	 *            The Sone to add
 	 */
 	public void addSone(Sone sone) {
-		if (sones.add(sone)) {
-			freenetInterface.registerUsk(sone, this);
+		if (!sones.add(sone)) {
+			freenetInterface.unregisterUsk(sone);
 		}
+		freenetInterface.registerUsk(sone, this);
 	}
 
 	/**
@@ -238,7 +240,7 @@ public class SoneDownloader extends AbstractService {
 			return null;
 		}
 
-		Sone sone = new Sone(originalSone.getId(), false).setIdentity(originalSone.getIdentity());
+		Sone sone = new SoneImpl(originalSone.getId(), originalSone.isLocal()).setIdentity(originalSone.getIdentity());
 
 		SimpleXML soneXml;
 		try {
@@ -467,7 +469,7 @@ public class SoneDownloader extends AbstractService {
 						return null;
 					}
 				}
-				Album album = core.getAlbum(id).setSone(sone).setTitle(title).setDescription(description);
+				Album album = core.getAlbum(id).setSone(sone).modify().setTitle(title).setDescription(description).update();
 				if (parent != null) {
 					parent.addAlbum(album);
 				} else {
@@ -494,13 +496,13 @@ public class SoneDownloader extends AbstractService {
 							logger.log(Level.WARNING, String.format("Downloaded Sone %s contains image %s with invalid dimensions (%s, %s)!", sone, imageId, imageWidthString, imageHeightString));
 							return null;
 						}
-						Image image = core.getImage(imageId).setSone(sone).setKey(imageKey).setCreationTime(creationTime);
-						image.setTitle(imageTitle).setDescription(imageDescription);
-						image.setWidth(imageWidth).setHeight(imageHeight);
+						Image image = core.getImage(imageId).modify().setSone(sone).setKey(imageKey).setCreationTime(creationTime).update();
+						image = image.modify().setTitle(imageTitle).setDescription(imageDescription).update();
+						image = image.modify().setWidth(imageWidth).setHeight(imageHeight).update();
 						album.addImage(image);
 					}
 				}
-				album.setAlbumImage(albumImageId);
+				album.modify().setAlbumImage(albumImageId).update();
 			}
 		}
 
@@ -517,7 +519,9 @@ public class SoneDownloader extends AbstractService {
 			sone.setReplies(replies);
 			sone.setLikePostIds(likedPostIds);
 			sone.setLikeReplyIds(likedReplyIds);
-			sone.setAlbums(topLevelAlbums);
+			for (Album album : topLevelAlbums) {
+				sone.getRootAlbum().addAlbum(album);
+			}
 		}
 
 		return sone;