From 84f8931ddd4f94a7a6a74ef3e5eabbcd9aa00ec7 Mon Sep 17 00:00:00 2001 From: jrandom <jrandom> Date: Tue, 24 Aug 2004 19:59:54 +0000 Subject: [PATCH] oOo's timestamper fixes (wtf was i thinking with those web params? !thwap) --- .../java/src/net/i2p/router/web/ConfigNetHandler.java | 3 ++- .../java/src/net/i2p/router/web/ConfigNetHelper.java | 4 ++-- core/java/src/net/i2p/time/Timestamper.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java index 3d7f4867c2..fb36e8fd12 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java @@ -222,9 +222,10 @@ public class ConfigNetHandler extends FormHandler { updateRates(); if (_timeSyncEnabled) { + // Time sync enable, means NOT disabled _context.router().setConfigSetting(Timestamper.PROP_DISABLED, "false"); } else { - _context.router().setConfigSetting(Timestamper.PROP_DISABLED, "false"); + _context.router().setConfigSetting(Timestamper.PROP_DISABLED, "true"); } boolean saved = _context.router().saveConfig(); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java index af0e441115..69d9579914 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java @@ -51,8 +51,8 @@ public class ConfigNetHelper { } public String getEnableTimeSyncChecked() { - String enabled = _context.getProperty(Timestamper.PROP_DISABLED, "true"); - if ( (enabled == null) || (!"true".equalsIgnoreCase(enabled)) ) + String disabled = _context.getProperty(Timestamper.PROP_DISABLED, "false"); + if ( (disabled != null) && ("true".equalsIgnoreCase(disabled)) ) return ""; else return " checked "; diff --git a/core/java/src/net/i2p/time/Timestamper.java b/core/java/src/net/i2p/time/Timestamper.java index 7fdec992f1..8dbf4e302f 100644 --- a/core/java/src/net/i2p/time/Timestamper.java +++ b/core/java/src/net/i2p/time/Timestamper.java @@ -180,7 +180,7 @@ public class Timestamper implements Runnable { String disabled = _context.getProperty(PROP_DISABLED); if (disabled == null) disabled = DEFAULT_DISABLED + ""; - _disabled = Boolean.getBoolean(disabled); + _disabled = Boolean.valueOf(disabled).booleanValue(); } /** -- GitLab