X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=1093c0c0113561b25dd399fe65d7221a3c9219cb;hp=4001f46dcb9d8ca177cf4d9f17b26852f8a2a8dc;hb=820f04de1741b7f3f5205a9520f1adfbd88e6d58;hpb=d56414a84610ebb0c72a0d93f0984a20c26ccc9e

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 4001f46..1093c0c 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -2175,8 +2175,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 			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;
@@ -2277,19 +2275,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");
@@ -2940,58 +2925,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;
-		}
-
 	}
 
 }