Author: nextgens
Date: 2006-07-31 13:31:39 +0000 (Mon, 31 Jul 2006)
New Revision: 9837
Modified:
trunk/freenet/src/freenet/node/updater/NodeUpdater.java
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
Log:
display the value of the DNFcounter on the NodeUpdate's useralert
Modified: trunk/freenet/src/freenet/node/updater/NodeUpdater.java
===================================================================
--- trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2006-07-31
12:58:47 UTC (rev 9836)
+++ trunk/freenet/src/freenet/node/updater/NodeUpdater.java 2006-07-31
13:31:39 UTC (rev 9837)
@@ -37,6 +37,7 @@
public class NodeUpdater implements ClientCallback, USKCallback {
public final static String UPDATE_URI = "freenet:USK at
SIDKS6l-eOU8IQqDo03d~3qqBd-69WG60aDgg4nWqss,CPFqYi95Is3GwzAdAKtAuFMCXDZFFWC3~uPoidCD67s,AQABAAE/update/"+Version.buildNumber()+"/";
public final static String REVOCATION_URI = "freenet:SSK at
VOfCZVTYPaatJ~eB~4lu2cPrWEmGyt4bfbB1v15Z6qQ,B6EynLhm7QE0se~rMgWWhl7wh3rFWjxJsEUcyohAm8A,AQABAAE/revoked/";
+ public final static int REVOCATION_DNF_MIN = 3;
private FetcherContext ctx;
private FetcherContext ctxRevocation;
@@ -186,7 +187,7 @@
System.err.println("Searching for revocation key");
this.queueFetchRevocation(100);
- while(revocationDNFCounter < 3) {
+ while(revocationDNFCounter < NodeUpdater.REVOCATION_DNF_MIN) {
System.err.println("Revocation counter:
"+revocationDNFCounter);
if(this.hasBeenBlown) {
Logger.error(this, "The revocation key has been
found on the network : blocking auto-update");
@@ -569,4 +570,8 @@
public void onMajorProgress() {
// Ignore
}
+
+ public int getRevocationDNFCounter() {
+ return revocationDNFCounter;
+ }
}
Modified:
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
===================================================================
---
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2006-07-31 12:58:47 UTC (rev 9836)
+++
trunk/freenet/src/freenet/node/useralerts/UpdatedVersionAvailableUserAlert.java
2006-07-31 13:31:39 UTC (rev 9837)
@@ -4,7 +4,7 @@
public class UpdatedVersionAvailableUserAlert implements UserAlert {
private boolean isValid, isReady;
- private NodeUpdater updater;
+ private final NodeUpdater updater;
private int version;
public UpdatedVersionAvailableUserAlert(int version, NodeUpdater
updater){
@@ -32,7 +32,7 @@
"Updating to "+version+" is advised. ";
if(updater.inFinalCheck()) {
- return s + "Your node is currently doing a final check
to verify the security of the update.";
+ return s + "Your node is currently doing a final check
to verify the security of the update.
("+updater.getRevocationDNFCounter()+"/"+NodeUpdater.REVOCATION_DNF_MIN+")";
} else {
if(isReady) return s+
" <form action=\"/\" method=\"post\"><input
type=\"submit\" name=\"update\" value=\"Update Now\" /></form>";
@@ -42,7 +42,10 @@
}
public short getPriorityClass() {
- return UserAlert.MINOR;
+ if(isReady || updater.inFinalCheck())
+ return UserAlert.WARNING;
+ else
+ return UserAlert.MINOR;
}
public boolean isValid() {
