I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit cfc06647 authored by zzz's avatar zzz
Browse files

Don't try to fetch subscriptions, news, or plugin updates while in VM Comm system

parent 2a3b55f3
No related branches found
No related tags found
No related merge requests found
...@@ -76,7 +76,8 @@ class SubscriptionIterator implements Iterator<AddressBook> { ...@@ -76,7 +76,8 @@ class SubscriptionIterator implements Iterator<AddressBook> {
public AddressBook next() { public AddressBook next() {
Subscription sub = this.subIterator.next(); Subscription sub = this.subIterator.next();
if (sub.getLastFetched() + this.delay < I2PAppContext.getGlobalContext().clock().now() && if (sub.getLastFetched() + this.delay < I2PAppContext.getGlobalContext().clock().now() &&
I2PAppContext.getGlobalContext().portMapper().getPort(PortMapper.SVC_HTTP_PROXY) >= 0) { I2PAppContext.getGlobalContext().portMapper().getPort(PortMapper.SVC_HTTP_PROXY) >= 0 &&
!I2PAppContext.getGlobalContext().getBooleanProperty("i2p.vmCommSystem")) {
//System.err.println("Fetching addressbook from " + sub.getLocation()); //System.err.println("Fetching addressbook from " + sub.getLocation());
return new AddressBook(sub, this.proxyHost, this.proxyPort); return new AddressBook(sub, this.proxyHost, this.proxyPort);
} else { } else {
......
...@@ -99,6 +99,11 @@ class NewsFetcher extends UpdateRunner { ...@@ -99,6 +99,11 @@ class NewsFetcher extends UpdateRunner {
_log.warn("Cannot fetch news - HTTP client tunnel not running"); _log.warn("Cannot fetch news - HTTP client tunnel not running");
return; return;
} }
if (shouldProxy && _context.commSystem().isDummy()) {
if (_log.shouldWarn())
_log.warn("Cannot fetch news - VM Comm system");
return;
}
for (URI uri : _urls) { for (URI uri : _urls) {
_currentURI = addLang(uri); _currentURI = addLang(uri);
......
...@@ -157,6 +157,12 @@ public class PluginStarter implements Runnable { ...@@ -157,6 +157,12 @@ public class PluginStarter implements Runnable {
Messages.getString("HTTP client proxy tunnel must be running", ctx)); Messages.getString("HTTP client proxy tunnel must be running", ctx));
return; return;
} }
if (ctx.commSystem().isDummy()) {
mgr.notifyComplete(null, Messages.getString("Plugin update check failed", ctx) +
" - " +
"VM Comm System");
return;
}
Log log = ctx.logManager().getLog(PluginStarter.class); Log log = ctx.logManager().getLog(PluginStarter.class);
int updated = 0; int updated = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment