diff --git a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java index 07f31b7a9..4f673b8b6 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java @@ -1097,7 +1097,7 @@ public class ConsoleUpdateManager implements UpdateManager { @Override public String toString() { - return "RegisteredUpdater " + updater + " for " + type + ' ' + method + " @pri " + priority; + return "RegisteredUpdater " + updater.getClass().getSimpleName() + " for " + type + ' ' + method + " @pri " + priority; } } @@ -1138,7 +1138,7 @@ public class ConsoleUpdateManager implements UpdateManager { @Override public String toString() { - return "RegisteredChecker " + checker + " for " + type + ' ' + method + " @pri " + priority; + return "RegisteredChecker " + checker.getClass().getSimpleName() + " for " + type + ' ' + method + " @pri " + priority; } } diff --git a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java index e99430446..c791549d5 100644 --- a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java +++ b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java @@ -97,15 +97,10 @@ class NewsFetcher extends UpdateRunner { else get = new EepGet(_context, false, null, 0, 0, _tempFile.getAbsolutePath(), newsURL, true, null, _lastModified); get.addStatusListener(this); + long start = _context.clock().now(); if (get.fetch()) { - String lastMod = get.getLastModified(); - if (lastMod != null) { - _lastModified = lastMod; - long lm = RFC822Date.parse822Date(lastMod); - if (lm == 0) - lm = _context.clock().now(); - _context.router().saveConfig(NewsHelper.PROP_LAST_CHECKED, Long.toString(lm)); - } + _context.router().saveConfig(NewsHelper.PROP_LAST_CHECKED, + Long.toString(start)); return; } } catch (Throwable t) { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java index 2c4cc16b2..cb6eb68b9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsHelper.java @@ -125,7 +125,7 @@ public class NewsHelper extends ContentHelper { * @since 0.9.4 */ public static boolean shouldShowNews(RouterContext ctx) { - long lastUpdated = lastUpdated(ctx); + long lastUpdated = lastUpdated(ctx); if (lastUpdated <= 0) return true; long last = ctx.getProperty(PROP_LAST_HIDDEN, 0L); diff --git a/core/java/src/net/i2p/update/UpdateType.java b/core/java/src/net/i2p/update/UpdateType.java index d4a702072..dd2daa7a4 100644 --- a/core/java/src/net/i2p/update/UpdateType.java +++ b/core/java/src/net/i2p/update/UpdateType.java @@ -13,5 +13,6 @@ public enum UpdateType { ROUTER_UNSIGNED, PLUGIN, PLUGIN_INSTALL, GEOIP, BLOCKLIST, RESEED, - HOMEPAGE + HOMEPAGE, + ADDRESSBOOK } diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java index 51af50554..8e5c202ab 100644 --- a/router/java/src/net/i2p/router/RouterContext.java +++ b/router/java/src/net/i2p/router/RouterContext.java @@ -416,6 +416,25 @@ public class RouterContext extends I2PAppContext { return super.getProperty(propName, defaultVal); } + /** + * Return a long with a long default + * @since 0.9.4 + */ + @Override + public long getProperty(String propName, long defaultVal) { + if (_router != null) { + String val = _router.getConfigSetting(propName); + if (val != null) { + long rv = defaultVal; + try { + rv = Long.parseLong(val); + } catch (NumberFormatException nfe) {} + return rv; + } + } + return super.getProperty(propName, defaultVal); + } + /** * @return new Properties with system and context properties * @since 0.8.4