From 1513695768c807aaaaa762ad93a5d8274e3f6720 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Tue, 22 Feb 2022 10:30:41 -0500
Subject: [PATCH] Update: Add notification for new version
remove old Java 7 check
---
.../router/update/ConsoleUpdateManager.java | 20 +++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
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 61449caac7..480b46c051 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
@@ -21,6 +21,7 @@ import net.i2p.I2PAppContext;
import net.i2p.app.ClientAppManager;
import net.i2p.app.ClientAppState;
import static net.i2p.app.ClientAppState.*;
+import net.i2p.app.NotificationService;
import net.i2p.crypto.SU3File;
import net.i2p.crypto.TrustedUpdate;
import net.i2p.data.DataHelper;
@@ -195,10 +196,7 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
List<URI> updateSources = uuh.getUpdateSources();
if (updateSources != null) {
VersionAvailable newVA;
- if (SystemVersion.isJava7())
- newVA = new VersionAvailable(newVersion, "", HTTP, updateSources);
- else
- newVA = new VersionAvailable(newVersion, "Requires Java 7");
+ newVA = new VersionAvailable(newVersion, "", HTTP, updateSources);
_available.put(new UpdateItem(ROUTER_UNSIGNED, ""), newVA);
}
}
@@ -212,10 +210,7 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
List<URI> updateSources = dsuh.getUpdateSources();
if (updateSources != null) {
VersionAvailable newVA;
- if (SystemVersion.isJava7())
- newVA = new VersionAvailable(newVersion, "", HTTP, updateSources);
- else
- newVA = new VersionAvailable(newVersion, "Requires Java 7");
+ newVA = new VersionAvailable(newVersion, "", HTTP, updateSources);
_available.put(new UpdateItem(ROUTER_DEV_SU3, ""), newVA);
}
} else {
@@ -899,6 +894,15 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
if (!shouldUpdate)
return false;
+ if (type == ROUTER_SIGNED_SU3 && _cmgr != null) {
+ NotificationService ns = (NotificationService) _cmgr.getRegisteredApp("desktopgui");
+ if (ns != null) {
+ ns.notify("Router", null, Log.INFO, _t("Router"),
+ _t("Update available") + ": " + _t("Version {0}", newVersion),
+ null);
+ }
+ }
+
String msg = null;
switch (type) {
case NEWS:
--
GitLab