X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=6d6c998faeb135e5af6339e7f7a174e4a452befa;hb=cb6009098271b6ded886490c125857c27e22dc06;hp=24f1209b1ac110f145b475e0d6562423f2775798;hpb=82d2c1f2d50600b500514c56b4aaeb6b64881772;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 24f1209..6d6c998 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -40,6 +40,7 @@ import net.pterodactylus.sone.freenet.wot.Identity;
 import net.pterodactylus.sone.freenet.wot.IdentityListener;
 import net.pterodactylus.sone.freenet.wot.IdentityManager;
 import net.pterodactylus.sone.freenet.wot.OwnIdentity;
+import net.pterodactylus.sone.freenet.wot.WebOfTrustException;
 import net.pterodactylus.sone.main.SonePlugin;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
@@ -818,7 +819,12 @@ public class Core implements IdentityListener {
 	 * @return The created Sone
 	 */
 	public Sone createSone(OwnIdentity ownIdentity) {
-		identityManager.addContext(ownIdentity, "Sone");
+		try {
+			ownIdentity.addContext("Sone");
+		} catch (WebOfTrustException wote1) {
+			logger.log(Level.SEVERE, "Could not add “Sone” context to own identity: " + ownIdentity, wote1);
+			return null;
+		}
 		Sone sone = addLocalSone(ownIdentity);
 		return sone;
 	}
@@ -885,6 +891,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) {
@@ -902,6 +911,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) {
@@ -966,8 +978,12 @@ public class Core implements IdentityListener {
 			localSones.remove(sone.getId());
 			soneInserters.remove(sone).stop();
 		}
-		identityManager.removeContext((OwnIdentity) sone.getIdentity(), "Sone");
-		identityManager.removeProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition");
+		try {
+			((OwnIdentity) sone.getIdentity()).removeContext("Sone");
+			((OwnIdentity) sone.getIdentity()).removeProperty("Sone.LatestEdition");
+		} catch (WebOfTrustException wote1) {
+			logger.log(Level.WARNING, "Could not remove context and properties from Sone: " + sone, wote1);
+		}
 		try {
 			configuration.getLongValue("Sone/" + sone.getId() + "/Time").setValue(null);
 		} catch (ConfigurationException ce1) {
@@ -1122,8 +1138,9 @@ public class Core implements IdentityListener {
 		}
 
 		logger.log(Level.INFO, "Saving Sone: %s", sone);
-		identityManager.setProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
 		try {
+			((OwnIdentity) sone.getIdentity()).setProperty("Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
+
 			/* save Sone into configuration. */
 			String sonePrefix = "Sone/" + sone.getId();
 			configuration.getLongValue(sonePrefix + "/Time").setValue(sone.getTime());
@@ -1143,9 +1160,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());
 			}
@@ -1186,6 +1201,8 @@ public class Core implements IdentityListener {
 			logger.log(Level.INFO, "Sone %s saved.", sone);
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.WARNING, "Could not save Sone: " + sone, ce1);
+		} catch (WebOfTrustException wote1) {
+			logger.log(Level.WARNING, "Could not set WoT property for Sone: " + sone, wote1);
 		}
 	}