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

Begin i2p.i2p.zzz.confsplit branch

Browse Source 
Code from Jan. 2018, never checked in, probably untested,
definitely incomplete.
This commit is contained in:
zzz
2019-05-10 14:58:41 +00:00
parent d8980d10a4
commit 63b2f29633
7 changed files with 492 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
View File

@ -342,23 +342,29 @@ public class ConfigServiceHandler extends FormHandler {
private void browseOnStartup(boolean shouldLaunchBrowser) {
List<ClientAppConfig> clients = ClientAppConfig.getClientApps(_context);
boolean found = false;
ClientAppConfig ca = null;
for (int cur = 0; cur < clients.size(); cur++) {
ClientAppConfig ca = clients.get(cur);
if (UrlLauncher.class.getName().equals(ca.className)) {
ClientAppConfig cac = clients.get(cur);
if (UrlLauncher.class.getName().equals(cac.className)) {
ca = cac;
ca.disabled = !shouldLaunchBrowser;
found = true;
break;
}
}
// releases <= 0.6.5 deleted the entry completely
if (shouldLaunchBrowser && !found) {
if (shouldLaunchBrowser && ca == null) {
String url = _context.portMapper().getConsoleURL();
ClientAppConfig ca = new ClientAppConfig(UrlLauncher.class.getName(), "consoleBrowser",
url, 5, false);
clients.add(ca);
ca = new ClientAppConfig(UrlLauncher.class.getName(), "consoleBrowser",
url, 5, false);
}
try {
if (ca != null)
ClientAppConfig.writeClientAppConfig(_context, ca);
addFormNotice(_t("Configuration saved successfully"));
} catch (IOException ioe) {
addFormError(_t("Error saving the configuration (applied but not saved) - please see the error logs"));
addFormError(ioe.getLocalizedMessage());
}
ClientAppConfig.writeClientAppConfig(_context, clients);
}
/**

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

@ -244,6 +244,18 @@ public class ConfigClientsHandler extends FormHandler {
}
private void saveClientChanges() {
try {
synchronized(ClientAppConfig.class) {
saveClientChanges2();
}
addFormNotice(_t("Client configuration saved successfully"));
} catch (IOException ioe) {
addFormError(_t("Error saving the configuration (applied but not saved) - please see the error logs"));
addFormError(ioe.getLocalizedMessage());
}
}
private void saveClientChanges2() throws IOException {
List<ClientAppConfig> clients = ClientAppConfig.getClientApps(_context);
for (int cur = 0; cur < clients.size(); cur++) {
ClientAppConfig ca = clients.get(cur);
@ -287,14 +299,12 @@ public class ConfigClientsHandler extends FormHandler {
if (name == null || name.trim().length() <= 0) name = "new client";
ClientAppConfig ca = new ClientAppConfig(clss, name, args, 2*60*1000,
_settings.get(newClient + ".enabled") == null); // true for disabled
clients.add(ca);
ClientAppConfig.writeClientAppConfig(_context, ca);
addFormNotice(_t("New client added") + ": " + name + " (" + clss + ").");
}
}
// Always save, as any of the disabled flags could have changed
ClientAppConfig.writeClientAppConfig(_context, clients);
addFormNotice(_t("Client configuration saved successfully"));
//addFormNotice(_t("Restart required to take effect"));
}
/**
@ -347,9 +357,14 @@ public class ConfigClientsHandler extends FormHandler {
addFormError(_t("Bad client index."));
return;
}
ClientAppConfig ca = clients.remove(i);
ClientAppConfig.writeClientAppConfig(_context, clients);
addFormNotice(_t("Client {0} deleted", ca.clientName));
ClientAppConfig ca = clients.get(i);
try {
ClientAppConfig.deleteClientAppConfig(ca);
addFormNotice(_t("Client {0} deleted", ca.clientName));
} catch (IOException ioe) {
addFormError(_t("Error saving the configuration (applied but not saved) - please see the error logs"));
addFormError(ioe.getLocalizedMessage());
}
}
private void saveWebAppChanges() {