From 1e024c22da9afa2642881578ca5cfe3dbdc21332 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 31 Jul 2012 23:11:22 +0000
Subject: [PATCH] fixup after merge
---
res/raw/router_config | 3 ---
src/net/i2p/android/router/activity/Init.java | 6 ++++++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/res/raw/router_config b/res/raw/router_config
index 6eb7636ac..4e3edbae0 100644
--- a/res/raw/router_config
+++ b/res/raw/router_config
@@ -54,6 +54,3 @@ i2np.udp.maxConnections=12
# not on android
i2np.upnp.enable=false
routerconsole.geoip.enable=false
-#
-# temp until certs are included
-router.reseedSSLDisable=true
diff --git a/src/net/i2p/android/router/activity/Init.java b/src/net/i2p/android/router/activity/Init.java
index 617f0c9c2..d8188dae6 100644
--- a/src/net/i2p/android/router/activity/Init.java
+++ b/src/net/i2p/android/router/activity/Init.java
@@ -63,6 +63,12 @@ class Init {
Properties props = new Properties();
props.setProperty("i2p.dir.temp", myDir + "/tmp");
props.setProperty("i2p.dir.pid", myDir + "/tmp");
+ // Time disabled in default router.config
+ // But lots of time problems on Android, not all carriers support NITZ
+ // and there was no NTP before 3.0. Tablets should be fine?
+ // Phones in airplane mode with wifi enabled still a problem.
+ if (Build.VERSION.SDK_INT < 11) // Honeycomb 3.0
+ props.setProperty("time.disabled", "false");
mergeResourceToFile(R.raw.router_config, "router.config", props);
mergeResourceToFile(R.raw.logger_config, "logger.config", null);
mergeResourceToFile(R.raw.i2ptunnel_config, "i2ptunnel.config", null);
--
GitLab