zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update: Require Java 7 to download dev builds

Browse Source
This commit is contained in:
zzz
2015-10-14 18:22:35 +00:00
parent 9224afb78d
commit 6aa8ed1280
4 changed files with 71 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
View File

@@ -724,6 +724,8 @@ public class SummaryHelper extends HelperBase {
boolean unsignedAvail = unsignedUpdateAvailable();
boolean devSU3Avail = devSU3UpdateAvailable();
String constraint = avail ? NewsHelper.updateConstraint() : null;
String unsignedConstraint = unsignedAvail ? NewsHelper.unsignedUpdateConstraint() : null;
String devSU3Constraint = devSU3Avail ? NewsHelper.devSU3UpdateConstraint() : null;
if (avail && constraint != null &&
!NewsHelper.isUpdateInProgress() &&
!_context.router().gracefulShutdownInProgress()) {
@@ -736,6 +738,30 @@ public class SummaryHelper extends HelperBase {
buf.append(constraint).append("</b></h4>");
avail = false;
}
if (unsignedAvail && unsignedConstraint != null &&
!NewsHelper.isUpdateInProgress() &&
!_context.router().gracefulShutdownInProgress()) {
if (needSpace)
buf.append("<hr>");
else
needSpace = true;
buf.append("<h4><b>").append(_t("Update available")).append(":<br>");
buf.append(_t("Version {0}", getUnsignedUpdateVersion())).append("<br>");
buf.append(unsignedConstraint).append("</b></h4>");
unsignedAvail = false;
}
if (devSU3Avail && devSU3Constraint != null &&
!NewsHelper.isUpdateInProgress() &&
!_context.router().gracefulShutdownInProgress()) {
if (needSpace)
buf.append("<hr>");
else
needSpace = true;
buf.append("<h4><b>").append(_t("Update available")).append(":<br>");
buf.append(_t("Version {0}", getDevSU3UpdateVersion())).append("<br>");
buf.append(devSU3Constraint).append("</b></h4>");
devSU3Avail = false;
}
if ((avail || unsignedAvail || devSU3Avail) &&
!NewsHelper.isUpdateInProgress() &&
!_context.router().gracefulShutdownInProgress() &&