X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=90b6e2ee5745d2953e114843c21bf430a8b7f8cb;hb=858555f647a1c39b2a6707192bdb8f32107aa5dd;hp=ba2b15c32f65613c7b54fd6ee07c034ee7e4fd0c;hpb=5bcc4f8e8d920408cf0c940ba67f6a1ebf9c4228;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 ba2b15c..90b6e2e 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -152,15 +152,12 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 
 	/** Sone inserters. */
 	/* synchronize access on this on sones. */
-	private final Map<Sone, SoneInserter> soneInserters = new HashMap<Sone, SoneInserter>();
+	private final Map<LocalSone, SoneInserter> soneInserters = new HashMap<LocalSone, SoneInserter>();
 
 	/** Sone rescuers. */
 	/* synchronize access on this on sones. */
 	private final Map<LocalSone, SoneRescuer> soneRescuers = new HashMap<LocalSone, SoneRescuer>();
 
-	/** All known Sones. */
-	private final Set<String> knownSones = new HashSet<String>();
-
 	/** The post database. */
 	private final Database database;
 
@@ -363,7 +360,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @return {@code true} if a modification has been detected in the Sone,
 	 *         {@code false} otherwise
 	 */
-	public boolean isModifiedSone(Sone sone) {
+	public boolean isModifiedSone(LocalSone sone) {
 		return soneInserters.containsKey(sone) && soneInserters.get(sone).isModified();
 	}
 
@@ -614,7 +611,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			return null;
 		}
 		logger.info(String.format("Adding Sone from OwnIdentity: %s", ownIdentity));
-		Sone sone = database.registerLocalSone(ownIdentity);
+		LocalSone sone = database.registerLocalSone(ownIdentity);
 		SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, ownIdentity.getId());
 		eventBus.register(soneInserter);
 		synchronized (soneInserters) {
@@ -669,9 +666,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		Sone sone = !newSone ? existingSone.get() : database.newSoneBuilder().from(identity).build();
 		sone.setLatestEdition(latestEdition);
 		if (newSone) {
-			synchronized (knownSones) {
-				newSone = !knownSones.contains(sone.getId());
-			}
+			newSone = !database.isSoneKnown(sone);
 			sone.setKnown(!newSone);
 			if (newSone) {
 				eventBus.post(new NewSoneFoundEvent(sone));
@@ -939,9 +934,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	public void markSoneKnown(Sone sone) {
 		if (!sone.isKnown()) {
 			sone.setKnown(true);
-			synchronized (knownSones) {
-				knownSones.add(sone.getId());
-			}
+			database.setSoneKnown(sone);
 			eventBus.post(new MarkSoneKnownEvent(sone));
 			touchConfiguration();
 		}
@@ -1250,7 +1243,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	public void serviceStop() {
 		localElementTicker.shutdownNow();
 		synchronized (soneInserters) {
-			for (Entry<Sone, SoneInserter> soneInserter : soneInserters.entrySet()) {
+			for (Entry<LocalSone, SoneInserter> soneInserter : soneInserters.entrySet()) {
 				soneInserter.getValue().stop();
 			}
 		}
@@ -1283,17 +1276,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		try {
 			preferences.saveTo(configuration);
 
-			/* save known Sones. */
-			int soneCounter = 0;
-			synchronized (knownSones) {
-				for (String knownSoneId : knownSones) {
-					configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").setValue(knownSoneId);
-				}
-				configuration.getStringValue("KnownSone/" + soneCounter + "/ID").setValue(null);
-			}
-
 			/* save Sone following times. */
-			soneCounter = 0;
+			int soneCounter = 0;
 			synchronized (soneFollowingTimes) {
 				for (Entry<String, Long> soneFollowingTime : soneFollowingTimes.entrySet()) {
 					configuration.getStringValue("SoneFollowingTimes/" + soneCounter + "/Sone").setValue(soneFollowingTime.getKey());
@@ -1326,20 +1310,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	private void loadConfiguration() {
 		new PreferencesLoader(preferences).loadFrom(configuration);
 
-		/* load known Sones. */
-		int soneCounter = 0;
-		while (true) {
-			String knownSoneId = configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").getValue(null);
-			if (knownSoneId == null) {
-				break;
-			}
-			synchronized (knownSones) {
-				knownSones.add(knownSoneId);
-			}
-		}
-
 		/* load Sone following times. */
-		soneCounter = 0;
+		int soneCounter = 0;
 		while (true) {
 			String soneId = configuration.getStringValue("SoneFollowingTimes/" + soneCounter + "/Sone").getValue(null);
 			if (soneId == null) {