Insert image after creating it.

[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 2b619b6..c30aef6 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -109,6 +109,9 @@ public class Core implements IdentityListener, UpdateListener, ImageInsertListen
        /** The Sone downloader. */
        private final SoneDownloader soneDownloader;
 
+       /** The image inserter. */
+       private final ImageInserter imageInserter;
+
        /** The update checker. */
        private final UpdateChecker updateChecker;
 
@@ -192,6 +195,7 @@ public class Core implements IdentityListener, UpdateListener, ImageInsertListen
                this.freenetInterface = freenetInterface;
                this.identityManager = identityManager;
                this.soneDownloader = new SoneDownloader(this, freenetInterface);
+               this.imageInserter = new ImageInserter(this, freenetInterface);
                this.updateChecker = new UpdateChecker(freenetInterface);
        }
 
@@ -1339,8 +1343,9 @@ public class Core implements IdentityListener, UpdateListener, ImageInsertListen
 
                /* load albums. */
                List<Album> topLevelAlbums = new ArrayList<Album>();
+               int albumCounter = 0;
                while (true) {
-                       String albumPrefix = sonePrefix + "/Albums/" + albums.size();
+                       String albumPrefix = sonePrefix + "/Albums/" + albumCounter++;
                        String albumId = configuration.getStringValue(albumPrefix + "/ID").getValue(null);
                        if (albumId == null) {
                                break;
@@ -1859,6 +1864,7 @@ public class Core implements IdentityListener, UpdateListener, ImageInsertListen
                synchronized (images) {
                        images.put(image.getId(), image);
                }
+               imageInserter.insertImage(temporaryImage, image);
                return image;
        }
 
@@ -1886,7 +1892,7 @@ public class Core implements IdentityListener, UpdateListener, ImageInsertListen
         * @param temporaryImage
         *            The temporary image to delete
         */
-       public void deteleTemporaryImage(TemporaryImage temporaryImage) {
+       public void deleteTemporaryImage(TemporaryImage temporaryImage) {
                Validation.begin().isNotNull("Temporary Image", temporaryImage).check();
                deleteTemporaryImage(temporaryImage.getId());
        }