X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=9a40e5c4242ab5e57a69caa58570b0c5fa9bbf18;hb=b95f0d80fa0ac4f9f6f8b51b2fecf796a1f72801;hp=4ea95a65bf4b538b553bad958f40cd08bbf73992;hpb=55e10d8a9a48f3942b32c9cd3278f9af00613b57;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 4ea95a6..9a40e5c 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -1074,11 +1074,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 */
 	public void setTrust(Sone origin, Sone target, int trustValue) {
 		Validation.begin().isNotNull("Trust Origin", origin).check().isInstanceOf("Trust Origin", origin.getIdentity(), OwnIdentity.class).isNotNull("Trust Target", target).isLessOrEqual("Trust Value", trustValue, 100).isGreaterOrEqual("Trust Value", trustValue, -100).check();
-		try {
-			((OwnIdentity) origin.getIdentity()).setTrust(target.getIdentity(), trustValue, preferences.getTrustComment());
-		} catch (WebOfTrustException wote1) {
-			logger.log(Level.WARNING, String.format("Could not set trust for Sone: %s", target), wote1);
-		}
+		trustUpdater.setTrust((OwnIdentity) origin.getIdentity(), target.getIdentity(), trustValue, preferences.getTrustComment());
 	}
 
 	/**
@@ -1091,11 +1087,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 */
 	public void removeTrust(Sone origin, Sone target) {
 		Validation.begin().isNotNull("Trust Origin", origin).isNotNull("Trust Target", target).check().isInstanceOf("Trust Origin Identity", origin.getIdentity(), OwnIdentity.class).check();
-		try {
-			((OwnIdentity) origin.getIdentity()).removeTrust(target.getIdentity());
-		} catch (WebOfTrustException wote1) {
-			logger.log(Level.WARNING, String.format("Could not remove trust for Sone: %s", target), wote1);
-		}
+		trustUpdater.setTrust((OwnIdentity) origin.getIdentity(), target.getIdentity(), null, null);
 	}
 
 	/**
@@ -2181,9 +2173,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			configuration.getStringValue("Option/TrustComment").setValue(options.getStringOption("TrustComment").getReal());
 			configuration.getBooleanValue("Option/ActivateFcpInterface").setValue(options.getBooleanOption("ActivateFcpInterface").getReal());
 			configuration.getIntValue("Option/FcpFullAccessRequired").setValue(options.getIntegerOption("FcpFullAccessRequired").getReal());
-			configuration.getBooleanValue("Option/SoneRescueMode").setValue(options.getBooleanOption("SoneRescueMode").getReal());
-			configuration.getBooleanValue("Option/ClearOnNextRestart").setValue(options.getBooleanOption("ClearOnNextRestart").getReal());
-			configuration.getBooleanValue("Option/ReallyClearOnNextRestart").setValue(options.getBooleanOption("ReallyClearOnNextRestart").getReal());
 
 			/* save known Sones. */
 			int soneCounter = 0;
@@ -2283,20 +2272,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			}
 
 		}));
-		options.addBooleanOption("SoneRescueMode", new DefaultOption<Boolean>(false));
-		options.addBooleanOption("ClearOnNextRestart", new DefaultOption<Boolean>(false));
-		options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption<Boolean>(false));
-
-		/* read options from configuration. */
-		options.getBooleanOption("ClearOnNextRestart").set(configuration.getBooleanValue("Option/ClearOnNextRestart").getValue(null));
-		options.getBooleanOption("ReallyClearOnNextRestart").set(configuration.getBooleanValue("Option/ReallyClearOnNextRestart").getValue(null));
-		boolean clearConfiguration = options.getBooleanOption("ClearOnNextRestart").get() && options.getBooleanOption("ReallyClearOnNextRestart").get();
-		options.getBooleanOption("ClearOnNextRestart").set(null);
-		options.getBooleanOption("ReallyClearOnNextRestart").set(null);
-		if (clearConfiguration) {
-			/* stop loading the configuration. */
-			return;
-		}
 
 		loadConfigurationValue("InsertionDelay");
 		loadConfigurationValue("PostsPerPage");
@@ -2309,7 +2284,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 		options.getStringOption("TrustComment").set(configuration.getStringValue("Option/TrustComment").getValue(null));
 		options.getBooleanOption("ActivateFcpInterface").set(configuration.getBooleanValue("Option/ActivateFcpInterface").getValue(null));
 		options.getIntegerOption("FcpFullAccessRequired").set(configuration.getIntValue("Option/FcpFullAccessRequired").getValue(null));
-		options.getBooleanOption("SoneRescueMode").set(configuration.getBooleanValue("Option/SoneRescueMode").getValue(null));
 
 		/* load known Sones. */
 		int soneCounter = 0;
@@ -2947,58 +2921,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			return this;
 		}
 
-		/**
-		 * Returns whether Sone should clear its settings on the next restart.
-		 * In order to be effective, {@link #isReallyClearOnNextRestart()} needs
-		 * to return {@code true} as well!
-		 *
-		 * @return {@code true} if Sone should clear its settings on the next
-		 *         restart, {@code false} otherwise
-		 */
-		public boolean isClearOnNextRestart() {
-			return options.getBooleanOption("ClearOnNextRestart").get();
-		}
-
-		/**
-		 * Sets whether Sone will clear its settings on the next restart.
-		 *
-		 * @param clearOnNextRestart
-		 *            {@code true} if Sone should clear its settings on the next
-		 *            restart, {@code false} otherwise
-		 * @return This preferences
-		 */
-		public Preferences setClearOnNextRestart(Boolean clearOnNextRestart) {
-			options.getBooleanOption("ClearOnNextRestart").set(clearOnNextRestart);
-			return this;
-		}
-
-		/**
-		 * Returns whether Sone should really clear its settings on next
-		 * restart. This is a confirmation option that needs to be set in
-		 * addition to {@link #isClearOnNextRestart()} in order to clear Sone’s
-		 * settings on the next restart.
-		 *
-		 * @return {@code true} if Sone should really clear its settings on the
-		 *         next restart, {@code false} otherwise
-		 */
-		public boolean isReallyClearOnNextRestart() {
-			return options.getBooleanOption("ReallyClearOnNextRestart").get();
-		}
-
-		/**
-		 * Sets whether Sone should really clear its settings on the next
-		 * restart.
-		 *
-		 * @param reallyClearOnNextRestart
-		 *            {@code true} if Sone should really clear its settings on
-		 *            the next restart, {@code false} otherwise
-		 * @return This preferences
-		 */
-		public Preferences setReallyClearOnNextRestart(Boolean reallyClearOnNextRestart) {
-			options.getBooleanOption("ReallyClearOnNextRestart").set(reallyClearOnNextRestart);
-			return this;
-		}
-
 	}
 
 }