From 112c2fe525f4869803ff6b40811c93991f0b6d6c Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 4 Jun 2025 10:45:03 -0400 Subject: [PATCH 1/3] Console: Add Java version warning to sidebar (Gitea #510) remove old check for ECDSA-P256 --- .../i2p/router/web/helpers/SummaryBarRenderer.java | 14 ++------------ .../jsp/themes/console/dark/console.css | 5 +++-- .../jsp/themes/console/light/console.css | 3 --- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java index fb94bf166d..0f780c7a02 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/SummaryBarRenderer.java @@ -793,21 +793,11 @@ class SummaryBarRenderer { .append(": ") .append(reachability.getMessage()) .append("\n"); - if (!SigType.ECDSA_SHA256_P256.isAvailable()) { - buf.append("
\n

") - .append(_t("Warning: ECDSA is not available. Update your Java or OS")) - .append("

\n"); - } - if (!SystemVersion.isJava7()) { + if (!SystemVersion.isJava(17)) { buf.append("

") .append(_t("Warning: Java version {0} is no longer supported by I2P.", System.getProperty("java.version"))) .append(' ') - .append(_t("Update Java to version {0} or higher to receive I2P updates.", "7")) + .append(_t("Update Java to version {0} or higher to receive I2P updates.", "17")) .append("

\n"); } return buf.toString(); diff --git a/apps/routerconsole/jsp/themes/console/dark/console.css b/apps/routerconsole/jsp/themes/console/dark/console.css index 0237b9a723..288f82de54 100644 --- a/apps/routerconsole/jsp/themes/console/dark/console.css +++ b/apps/routerconsole/jsp/themes/console/dark/console.css @@ -414,11 +414,12 @@ div.warning { } .routersummary h4 { + background: #333; border: 0; border-bottom: 0 !important; font-size: 8pt; margin: -6px -9px -8px !important; - padding: 6px 1px; + padding: 6px 2px; text-decoration: none !important; color: #e6e6e7; line-height: 120%; @@ -6881,7 +6882,7 @@ form[action="events"] { .routersummary .firewalled::before, .routersummary .vmcomm::before, .routersummary .clockskew::before { - margin-right: 2px; + margin-right: 4px; vertical-align: middle; display: inline-block; filter: drop-shadow(0 0 1px rgba(192, 192, 192, 0.5)); diff --git a/apps/routerconsole/jsp/themes/console/light/console.css b/apps/routerconsole/jsp/themes/console/light/console.css index 3758381e39..392687bff6 100644 --- a/apps/routerconsole/jsp/themes/console/light/console.css +++ b/apps/routerconsole/jsp/themes/console/light/console.css @@ -292,7 +292,6 @@ h3#helpfaq { .routersummary h4 { border: #dee2e6; - border-radius: 0; font-size: 8.5pt; letter-spacing: normal; text-transform: none; @@ -303,7 +302,6 @@ h3#helpfaq { text-decoration: none !important; color: #343a40; box-shadow: inset 0 0 0 1px #dee2e6; - line-height: 105%; } .routersummary h4::after { @@ -852,7 +850,6 @@ p:empty+.sb_notice { .routersummary .warn, .routersummary .clockskew { background: rgba(255, 255, 200, 0.25); - box-shadow: inset 0 0 0 1px #ff0, 0 0 1px rgba(96, 96, 96, 0.5); } .routersummary .testing { From d41fbee60292cb80f34fa55bcedd994c8de23077 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 5 Jun 2025 16:50:12 -0400 Subject: [PATCH 2/3] fix release date --- history.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/history.txt b/history.txt index 015b6c7c61..0d7204b345 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,4 @@ -2025-03-29 2.9.0 (API 0.9.66) released +2025-06-02 2.9.0 (API 0.9.66) released 2025-05-30 zzz * Pull translations from Transifex From 0995aa268eafb60a1b90af47a457e6f39238ea57 Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 5 Jun 2025 16:53:45 -0400 Subject: [PATCH 3/3] i2ptunnel: Remove delay before flushing output --- .../java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java index 8218e0f6f3..2da92eb5a3 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelRunner.java @@ -657,18 +657,7 @@ public class I2PTunnelRunner extends I2PAppThread implements I2PSocket.SocketErr //if (_log.shouldLog(Log.DEBUG)) // _log.debug(direction + ": " + len + " bytes flushed through " + (_toI2P ? "to " : "from ") // + to); - if (_toI2P) { - try { - Thread.sleep(5); - } catch (InterruptedException e) { - e.printStackTrace(); - } - - if (in.available() <= 0) - out.flush(); - } else { - out.flush(); - } + out.flush(); } } //if (_log.shouldDebug())