From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sun, 19 Jul 2015 18:43:54 +0000 (+0200)
Subject: Merge branch 'release/0.9.2'
X-Git-Tag: 0.9.2^0
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=0cefad523bfa6d57bad7b20b0491394edebb28fa;hp=36f646119c5dd6cf5f4db43c269c69bd790f1a4a

Merge branch 'release/0.9.2'
---

diff --git a/pom.xml b/pom.xml
index b5a7c8b..4609326 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.pterodactylus</groupId>
 	<artifactId>sone</artifactId>
-	<version>0.9.1</version>
+	<version>0.9.2</version>
 	<dependencies>
 		<dependency>
 			<groupId>net.pterodactylus</groupId>
diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 95b4bfe..73bb95f 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -645,14 +645,13 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		sone.setLatestEdition(fromNullable(tryParse(property)).or(0L));
 		sone.setClient(new Client("Sone", SonePlugin.VERSION.toString()));
 		sone.setKnown(true);
-		loadSone(sone);
-		sone.setStatus(SoneStatus.idle);
-		database.storeSone(sone);
 		SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, ownIdentity.getId());
 		eventBus.register(soneInserter);
 		synchronized (soneInserters) {
 			soneInserters.put(sone, soneInserter);
 		}
+		loadSone(sone);
+		sone.setStatus(SoneStatus.idle);
 		soneInserter.start();
 		return sone;
 	}
@@ -1086,6 +1085,7 @@ 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);
 			}
diff --git a/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java b/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
index 290fcbe..5c1c021 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneModificationDetector.java
@@ -10,6 +10,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import net.pterodactylus.sone.data.Sone;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Objects;
 import com.google.common.base.Optional;
 import com.google.common.base.Ticker;
 
@@ -76,7 +77,7 @@ class SoneModificationDetector {
 	}
 
 	public boolean isModified() {
-		return !lockableFingerprintProvider.getFingerprint().equals(originalFingerprint);
+		return !Objects.equal(lockableFingerprintProvider.getFingerprint(), originalFingerprint);
 	}
 
 	/**
diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 3960479..b80aa47 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -116,12 +116,12 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 9, 1);
+	public static final Version VERSION = new Version(0, 9, 2);
 
 	/** The current year at time of release. */
 	private static final int YEAR = 2015;
 	private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
-	private static final int LATEST_EDITION = 68;
+	private static final int LATEST_EDITION = 69;
 
 	/** The logger. */
 	private static final Logger logger = getLogger("Sone.Plugin");