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

* UpdateManager:

Browse Source 
- Convert to RouterApp and remove update hooks from context
     (ticket #1185)
This commit is contained in:
zzz
2014-02-07 15:40:23 +00:00
parent 37bf750ab9
commit ef3a12f01a
11 changed files with 114 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHandler.java
View File

@@ -370,7 +370,7 @@ public class ConfigClientsHandler extends FormHandler {
* @param app null for a new install
*/
private void installPlugin(String app, String url) {
ConsoleUpdateManager mgr = (ConsoleUpdateManager) _context.updateManager();
ConsoleUpdateManager mgr = UpdateHandler.updateManager(_context);
if (mgr == null) {
addFormError("Update manager not registered, cannot install");
return;
@@ -397,7 +397,7 @@ public class ConfigClientsHandler extends FormHandler {
}
private void checkPlugin(String app) {
ConsoleUpdateManager mgr = (ConsoleUpdateManager) _context.updateManager();
ConsoleUpdateManager mgr = UpdateHandler.updateManager(_context);
if (mgr == null) {
addFormError("Update manager not registered, cannot check");
return;

2
apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java
View File

@@ -139,7 +139,7 @@ public class ConfigUpdateHandler extends FormHandler {
if (_action == null)
return;
if (_action.equals(_("Check for updates"))) {
ConsoleUpdateManager mgr = (ConsoleUpdateManager) _context.updateManager();
ConsoleUpdateManager mgr = UpdateHandler.updateManager(_context);
if (mgr == null) {
addFormError("Update manager not registered, cannot check");
return;

2
apps/routerconsole/java/src/net/i2p/router/web/PluginStarter.java
View File

@@ -121,7 +121,7 @@ public class PluginStarter implements Runnable {
if (toUpdate.isEmpty())
return;
ConsoleUpdateManager mgr = (ConsoleUpdateManager) ctx.updateManager();
ConsoleUpdateManager mgr = UpdateHandler.updateManager(ctx);
if (mgr == null)
return;
if (mgr.isUpdateInProgress())

2
apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java
View File

@@ -645,7 +645,7 @@ public class RouterConsoleRunner implements RouterApp {
t.setPriority(Thread.NORM_PRIORITY - 1);
t.start();
ConsoleUpdateManager um = new ConsoleUpdateManager(_context);
ConsoleUpdateManager um = new ConsoleUpdateManager(_context, _mgr, null);
um.start();
if (PluginStarter.pluginsEnabled(_context)) {

15
apps/routerconsole/java/src/net/i2p/router/web/UpdateHandler.java
View File

@@ -1,7 +1,9 @@
package net.i2p.router.web;
import net.i2p.app.ClientAppManager;
import net.i2p.router.RouterContext;
import net.i2p.router.update.ConsoleUpdateManager;
import net.i2p.update.UpdateManager;
import net.i2p.update.UpdateType;
import static net.i2p.update.UpdateType.*;
import net.i2p.util.Log;
@@ -33,6 +35,17 @@ public class UpdateHandler {
_context = ctx;
_log = ctx.logManager().getLog(UpdateHandler.class);
}
/**
* @return null if not found
* @since 0.9.12
*/
public static ConsoleUpdateManager updateManager(RouterContext ctx) {
ClientAppManager cmgr = ctx.clientAppManager();
if (cmgr == null)
return null;
return (ConsoleUpdateManager) cmgr.getRegisteredApp(UpdateManager.APP_NAME);
}
/**
* Configure this bean to query a particular router context
@@ -75,7 +88,7 @@ public class UpdateHandler {
}
private void update(UpdateType type) {
ConsoleUpdateManager mgr = (ConsoleUpdateManager) _context.updateManager();
ConsoleUpdateManager mgr = updateManager(_context);
if (mgr == null)
return;
if (mgr.isUpdateInProgress(ROUTER_SIGNED) || mgr.isUpdateInProgress(ROUTER_UNSIGNED) ||