From b068f9a262b05d14dc7349eb8cc213c39c01681c Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 2 Oct 2015 13:43:54 +0000
Subject: [PATCH] Router: Don't check config files for reload on Android
---
core/java/src/net/i2p/util/LogWriterBase.java | 4 +++-
.../src/net/i2p/router/startup/BootCommSystemJob.java | 10 +++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/core/java/src/net/i2p/util/LogWriterBase.java b/core/java/src/net/i2p/util/LogWriterBase.java
index 08683b6226..b9b98e10d4 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 2b3be55868..bb9f308463 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());
}
--
GitLab