X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=895f57065245c61cb140af9ba64fe187613ef1b3;hb=c48a672defca02eeda19debeb99ef25bd864e696;hp=bdea9893f0b1ccd7c12e0e6c7ae8fce0075a75b9;hpb=a57e3b33c5837a40aa08c11fb92f600d928be1ab;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 bdea989..895f570 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -561,10 +561,9 @@ public class Core implements IdentityListener {
 		synchronized (newPosts) {
 			boolean isNew = !knownPosts.contains(postId) && newPosts.contains(postId);
 			if (markAsKnown) {
-				newPosts.remove(postId);
-				knownPosts.add(postId);
-				if (isNew) {
-					coreListenerManager.fireMarkPostKnown(getPost(postId));
+				Post post = getPost(postId, false);
+				if (post != null) {
+					markPostKnown(post);
 				}
 			}
 			return isNew;
@@ -654,10 +653,9 @@ public class Core implements IdentityListener {
 		synchronized (newReplies) {
 			boolean isNew = !knownReplies.contains(replyId) && newReplies.contains(replyId);
 			if (markAsKnown) {
-				newReplies.remove(replyId);
-				knownReplies.add(replyId);
-				if (isNew) {
-					coreListenerManager.fireMarkReplyKnown(getReply(replyId));
+				Reply reply = getReply(replyId, false);
+				if (reply != null) {
+					markReplyKnown(reply);
 				}
 			}
 			return isNew;
@@ -887,6 +885,9 @@ public class Core implements IdentityListener {
 				if (!soneRescueMode) {
 					for (Post post : storedSone.getPosts()) {
 						posts.remove(post.getId());
+						if (!sone.getPosts().contains(post)) {
+							coreListenerManager.firePostRemoved(post);
+						}
 					}
 				}
 				synchronized (newPosts) {
@@ -904,6 +905,9 @@ public class Core implements IdentityListener {
 				if (!soneRescueMode) {
 					for (Reply reply : storedSone.getReplies()) {
 						replies.remove(reply.getId());
+						if (!sone.getReplies().contains(reply)) {
+							coreListenerManager.fireReplyRemoved(reply);
+						}
 					}
 				}
 				synchronized (newReplies) {
@@ -1145,9 +1149,7 @@ public class Core implements IdentityListener {
 			for (Post post : sone.getPosts()) {
 				String postPrefix = sonePrefix + "/Posts/" + postCounter++;
 				configuration.getStringValue(postPrefix + "/ID").setValue(post.getId());
-				if (post.getRecipient() != null) {
-					configuration.getStringValue(postPrefix + "/Recipient").setValue(post.getRecipient().getId());
-				}
+				configuration.getStringValue(postPrefix + "/Recipient").setValue((post.getRecipient() != null) ? post.getRecipient().getId() : null);
 				configuration.getLongValue(postPrefix + "/Time").setValue(post.getTime());
 				configuration.getStringValue(postPrefix + "/Text").setValue(post.getText());
 			}
@@ -1185,6 +1187,7 @@ public class Core implements IdentityListener {
 			}
 			configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
 
+			configuration.save();
 			logger.log(Level.INFO, "Sone %s saved.", sone);
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.WARNING, "Could not save Sone: " + sone, ce1);