X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=8e00e23668f76f11bd0c84e84b55c746a14b9413;hb=6b65a32a69b0e3721c58b4501a6b58fa4989f162;hp=73bb95fea97b87fb73c335d0d5b0d573763b3254;hpb=d90d5d1cf6accb7715843a5e49be737e45a929bb;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 73bb95f..8e00e23 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -116,7 +116,7 @@ import com.google.inject.Singleton;
 public class Core extends AbstractService implements SoneProvider, PostProvider, PostReplyProvider {
 
 	/** The logger. */
-	private static final Logger logger = getLogger("Sone.Core");
+	private static final Logger logger = getLogger(Core.class.getName());
 
 	/** The start time. */
 	private final long startupTime = System.currentTimeMillis();
@@ -651,6 +651,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			soneInserters.put(sone, soneInserter);
 		}
 		loadSone(sone);
+		database.storeSone(sone);
 		sone.setStatus(SoneStatus.idle);
 		soneInserter.start();
 		return sone;
@@ -687,8 +688,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			logger.log(Level.WARNING, "Given Identity is null!");
 			return null;
 		}
-		final Long latestEdition = tryParse(fromNullable(
-				identity.getProperty("Sone.LatestEdition")).or("0"));
+		String property = fromNullable(identity.getProperty("Sone.LatestEdition")).or("0");
+		long latestEdition = fromNullable(tryParse(property)).or(0L);
 		Optional<Sone> existingSone = getSone(identity.getId());
 		if (existingSone.isPresent() && existingSone.get().isLocal()) {
 			return existingSone.get();
@@ -1064,11 +1065,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		}
 
 		/* load options. */
-		sone.getOptions().setAutoFollow(configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").getValue(null));
-		sone.getOptions().setSoneInsertNotificationEnabled(configuration.getBooleanValue(sonePrefix + "/Options/EnableSoneInsertNotifications").getValue(null));
-		sone.getOptions().setShowNewSoneNotifications(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewSones").getValue(null));
-		sone.getOptions().setShowNewPostNotifications(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewPosts").getValue(null));
-		sone.getOptions().setShowNewReplyNotifications(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewReplies").getValue(null));
+		sone.getOptions().setAutoFollow(configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").getValue(false));
+		sone.getOptions().setSoneInsertNotificationEnabled(configuration.getBooleanValue(sonePrefix + "/Options/EnableSoneInsertNotifications").getValue(false));
+		sone.getOptions().setShowNewSoneNotifications(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewSones").getValue(true));
+		sone.getOptions().setShowNewPostNotifications(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewPosts").getValue(true));
+		sone.getOptions().setShowNewReplyNotifications(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewReplies").getValue(true));
 		sone.getOptions().setShowCustomAvatars(ShowCustomAvatars.valueOf(configuration.getStringValue(sonePrefix + "/Options/ShowCustomAvatars").getValue(ShowCustomAvatars.NEVER.name())));
 
 		/* if we’re still here, Sone was loaded successfully. */
@@ -1085,7 +1086,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			for (Album album : topLevelAlbums) {
 				sone.getRootAlbum().addAlbum(album);
 			}
-			database.storeSone(sone);
 			synchronized (soneInserters) {
 				soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
 			}
@@ -1514,7 +1514,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			int albumCounter = 0;
 			for (Album album : albums) {
 				String albumPrefix = sonePrefix + "/Albums/" + albumCounter++;
-				configuration.getStringValue(albumPrefix + "/ID").setValue(album.getId());
+				configuration.getStringValue(albumPrefix + "/ID").setValue(album.getInternalId());
 				configuration.getStringValue(albumPrefix + "/Title").setValue(album.getTitle());
 				configuration.getStringValue(albumPrefix + "/Description").setValue(album.getDescription());
 				configuration.getStringValue(albumPrefix + "/Parent").setValue(album.getParent().equals(sone.getRootAlbum()) ? null : album.getParent().getId());
@@ -1531,7 +1531,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 					}
 					String imagePrefix = sonePrefix + "/Images/" + imageCounter++;
 					configuration.getStringValue(imagePrefix + "/ID").setValue(image.getId());
-					configuration.getStringValue(imagePrefix + "/Album").setValue(album.getId());
+					configuration.getStringValue(imagePrefix + "/Album").setValue(album.getInternalId());
 					configuration.getStringValue(imagePrefix + "/Key").setValue(image.getKey());
 					configuration.getStringValue(imagePrefix + "/Title").setValue(image.getTitle());
 					configuration.getStringValue(imagePrefix + "/Description").setValue(image.getDescription());