X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=ba12a8daebfa550e479892c887d585fb429db881;hp=12294480019d16fb3a87f1b1f41863f5927d0b8b;hb=f0bf9ce12950f0a6106f59f105dae69592203f35;hpb=5bcdc1b924c598b1e59551d44e2302ef29258dad

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 1229448..ba12a8d 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -229,6 +229,20 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		this.database = database;
 	}
 
+	@VisibleForTesting
+	protected Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, SoneDownloader soneDownloader, ImageInserter imageInserter, UpdateChecker updateChecker, WebOfTrustUpdater webOfTrustUpdater, EventBus eventBus, Database database) {
+		super("Sone Core");
+		this.configuration = configuration;
+		this.freenetInterface = freenetInterface;
+		this.identityManager = identityManager;
+		this.soneDownloader = soneDownloader;
+		this.imageInserter = imageInserter;
+		this.updateChecker = updateChecker;
+		this.webOfTrustUpdater = webOfTrustUpdater;
+		this.eventBus = eventBus;
+		this.database = database;
+	}
+
 	//
 	// ACCESSORS
 	//
@@ -592,7 +606,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *            The ID of the album
 	 * @return The album with the given ID
 	 */
-	public Album getAlbum(String albumId) {
+	public Album getOrCreateAlbum(String albumId) {
 		return getAlbum(albumId, true);
 	}
 
@@ -1217,7 +1231,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				logger.log(Level.WARNING, "Invalid album found, aborting load!");
 				return;
 			}
-			Album album = getAlbum(albumId).setSone(sone).modify().setTitle(albumTitle).setDescription(albumDescription).setAlbumImage(albumImageId).update();
+			Album album = getOrCreateAlbum(albumId).setSone(sone).modify().setTitle(albumTitle).setDescription(albumDescription).setAlbumImage(albumImageId).update();
 			if (albumParentId != null) {
 				Album parentAlbum = getAlbum(albumParentId, false);
 				if (parentAlbum == null) {