diff --git a/core/java/src/net/i2p/util/LogWriterBase.java b/core/java/src/net/i2p/util/LogWriterBase.java index 08683b62260bf27d5c6151b7591bea57e5614c98..b9b98e10d4e9723b4545d690fd29cafff0da9628 100644 --- a/core/java/src/net/i2p/util/LogWriterBase.java +++ b/core/java/src/net/i2p/util/LogWriterBase.java @@ -67,10 +67,12 @@ abstract class LogWriterBase implements Runnable { public void run() { _write = true; + // don't bother on Android + final boolean shouldReadConfig = !SystemVersion.isAndroid(); try { while (_write) { flushRecords(); - if (_write) + if (_write && shouldReadConfig) rereadConfig(); } } catch (Exception e) { diff --git a/router/java/src/net/i2p/router/startup/BootCommSystemJob.java b/router/java/src/net/i2p/router/startup/BootCommSystemJob.java index 2b3be55868bbc99181b7c57acf8bbebdc4c235b3..bb9f308463d20dea1af2ec7a0af820111f48a5e4 100644 --- a/router/java/src/net/i2p/router/startup/BootCommSystemJob.java +++ b/router/java/src/net/i2p/router/startup/BootCommSystemJob.java @@ -14,6 +14,7 @@ import net.i2p.router.RouterContext; import net.i2p.router.RouterClock; import net.i2p.router.tasks.ReadConfigJob; import net.i2p.util.Log; +import net.i2p.util.SystemVersion; /** This actually boots almost everything */ class BootCommSystemJob extends JobImpl { @@ -46,9 +47,12 @@ class BootCommSystemJob extends JobImpl { // start I2CP getContext().jobQueue().addJob(new StartAcceptingClientsJob(getContext())); - Job j = new ReadConfigJob(getContext()); - j.getTiming().setStartAfter(getContext().clock().now() + 2*60*1000); - getContext().jobQueue().addJob(j); + if (!SystemVersion.isAndroid()) { + Job j = new ReadConfigJob(getContext()); + j.getTiming().setStartAfter(getContext().clock().now() + 2*60*1000); + getContext().jobQueue().addJob(j); + } + ((RouterClock) getContext().clock()).addShiftListener(getContext().router()); }