X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=ed34ef2d4e7260cff984a62604aeb0b0c22a1366;hp=7a978420a45a219c46526afab4cd19b4fe6f89de;hb=c3240e5c85d0cd49e346939f864cf93fa36daed0;hpb=7b1a3e4378a632ad4b9e32373921cfad4fd91e8d

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 7a97842..ed34ef2 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -137,11 +137,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	/* synchronize access on this on itself. */
 	private Map<String, Sone> remoteSones = new HashMap<String, Sone>();
 
-	/** All new Sones. */
-	private Set<String> newSones = new HashSet<String>();
-
 	/** All known Sones. */
-	/* synchronize access on {@link #newSones}. */
 	private Set<String> knownSones = new HashSet<String>();
 
 	/** All posts. */
@@ -504,19 +500,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	}
 
 	/**
-	 * Returns whether the Sone with the given ID is a new Sone.
-	 *
-	 * @param soneId
-	 *            The ID of the sone to check for
-	 * @return {@code true} if the given Sone is new, false otherwise
-	 */
-	public boolean isNewSone(String soneId) {
-		synchronized (newSones) {
-			return !knownSones.contains(soneId) && newSones.contains(soneId);
-		}
-	}
-
-	/**
 	 * Returns whether the given Sone has been modified.
 	 *
 	 * @param sone
@@ -972,12 +955,10 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			sone.setRequestUri(getSoneUri(identity.getRequestUri()));
 			sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
 			if (newSone) {
-				synchronized (newSones) {
+				synchronized (knownSones) {
 					newSone = !knownSones.contains(sone.getId());
-					if (newSone) {
-						newSones.add(sone.getId());
-					}
 				}
+				sone.setKnown(!newSone);
 				if (newSone) {
 					coreListenerManager.fireNewSoneFound(sone);
 					for (Sone localSone : getLocalSones()) {
@@ -1353,12 +1334,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 *            The Sone to mark as known
 	 */
 	public void markSoneKnown(Sone sone) {
-		synchronized (newSones) {
-			if (newSones.remove(sone.getId())) {
+		if (!sone.isKnown()) {
+			sone.setKnown(true);
+			synchronized (knownSones) {
 				knownSones.add(sone.getId());
-				coreListenerManager.fireMarkSoneKnown(sone);
-				touchConfiguration();
 			}
+			coreListenerManager.fireMarkSoneKnown(sone);
+			touchConfiguration();
 		}
 	}
 
@@ -1569,7 +1551,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			sone.setAlbums(topLevelAlbums);
 			soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
 		}
-		synchronized (newSones) {
+		synchronized (knownSones) {
 			for (String friend : friends) {
 				knownSones.add(friend);
 			}
@@ -2232,7 +2214,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 
 			/* save known Sones. */
 			int soneCounter = 0;
-			synchronized (newSones) {
+			synchronized (knownSones) {
 				for (String knownSoneId : knownSones) {
 					configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").setValue(knownSoneId);
 				}
@@ -2361,7 +2343,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			if (knownSoneId == null) {
 				break;
 			}
-			synchronized (newSones) {
+			synchronized (knownSones) {
 				knownSones.add(knownSoneId);
 			}
 		}
@@ -2554,10 +2536,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		synchronized (remoteSones) {
 			remoteSones.remove(identity.getId());
 		}
-		synchronized (newSones) {
-			newSones.remove(identity.getId());
-			coreListenerManager.fireSoneRemoved(sone);
-		}
+		coreListenerManager.fireSoneRemoved(sone);
 	}
 
 	//