* Update:

- Change default to "Download and verify"
      - Change news fetch default to 24h (was 12h)
This commit is contained in:
zzz
2009-04-03 21:42:48 +00:00
parent bb0531053d
commit 8de5609817
3 changed files with 13 additions and 6 deletions

View File

@ -21,9 +21,9 @@ public class ConfigUpdateHandler extends FormHandler {
// public static final String DEFAULT_NEWS_URL = "http://dev.i2p.net/cgi-bin/cvsweb.cgi/i2p/news.xml?rev=HEAD";
public static final String DEFAULT_NEWS_URL = "http://complication.i2p/news.xml";
public static final String PROP_REFRESH_FREQUENCY = "router.newsRefreshFrequency";
public static final String DEFAULT_REFRESH_FREQUENCY = 12*60*60*1000 + "";
public static final String DEFAULT_REFRESH_FREQUENCY = 24*60*60*1000 + "";
public static final String PROP_UPDATE_POLICY = "router.updatePolicy";
public static final String DEFAULT_UPDATE_POLICY = "notify";
public static final String DEFAULT_UPDATE_POLICY = "download";
public static final String PROP_SHOULD_PROXY = "router.updateThroughProxy";
public static final String DEFAULT_SHOULD_PROXY = Boolean.TRUE.toString();
public static final String PROP_PROXY_HOST = "router.updateProxyHost";

View File

@ -166,6 +166,8 @@ public class UpdateHandler {
} else {
_log.log(Log.CRIT, "Update was VERIFIED, will be installed at next restart");
_status = "<b>Update downloaded</b><br />Click Restart to Install";
if (up.newVersion() != null)
_status += " Version " + up.newVersion();
}
} else {
err = err + " from " + url;

View File

@ -108,6 +108,7 @@ D8usM7Dxp5yrDrCYZ5AIijc=
private Log _log;
private ArrayList _trustedKeys;
private String _newVersion;
/**
* Constructs a new <code>TrustedUpdate</code> with the default global
@ -127,6 +128,7 @@ D8usM7Dxp5yrDrCYZ5AIijc=
_context = context;
_log = _context.logManager().getLog(TrustedUpdate.class);
_trustedKeys = new ArrayList();
_newVersion = null;
String propertyTrustedKeys = context.getProperty(PROP_TRUSTED_KEYS);
@ -379,6 +381,11 @@ D8usM7Dxp5yrDrCYZ5AIijc=
}
}
/** version in the .sud file, valid only after calling migrateVerified() */
public String newVersion() {
return _newVersion;
}
/**
* Verifies that the version of the given signed update file is newer than
* <code>currentVersion</code>.
@ -390,10 +397,8 @@ D8usM7Dxp5yrDrCYZ5AIijc=
* than the current version, otherwise <code>false</code>.
*/
public boolean isUpdatedVersion(String currentVersion, String signedFile) {
if (needsUpdate(currentVersion, getVersionString(signedFile)))
return true;
else
return false;
_newVersion = getVersionString(signedFile);
return needsUpdate(currentVersion, getVersionString(signedFile));
}
/**