Update: Add notification for new version
remove old Java 7 check
This commit is contained in:
@@ -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:
|
||||
|
Reference in New Issue
Block a user