private static final int MAX_FONT_SIZE = 30;
+ private String previousProxyType;
+
/**
* Holds name and link separated with | character. Sequence ID must be
* $SEQUENCE_ID$ or $SEQUENCE_ID=/.possible | chars ./=$
}
String proxyTypeString = Cache.getDefault("USE_PROXY", "false");
+ previousProxyType = proxyTypeString;
switch (proxyTypeString)
{
- case "none":
+ case Cache.PROXYTYPE_NONE:
proxyType.setSelected(noProxy.getModel(), true);
break;
- case "false":
+ case Cache.PROXYTYPE_SYSTEM:
proxyType.setSelected(systemProxy.getModel(), true);
break;
- case "true":
+ case Cache.PROXYTYPE_CUSTOM:
proxyType.setSelected(customProxy.getModel(), true);
break;
default:
proxyPortHttpTB.setText(Cache.getDefault("PROXY_PORT", ""));
proxyServerHttpsTB.setText(Cache.getDefault("PROXY_SERVER_HTTPS", ""));
proxyPortHttpsTB.setText(Cache.getDefault("PROXY_PORT_HTTPS", ""));
+ proxyAuth.setSelected(Cache.getDefault("PROXY_AUTH", false));
+ proxyAuthUsernameTB
+ .setText(Cache.getDefault("PROXY_AUTH_USERNAME", ""));
+ proxyAuthPasswordTB
+ .setText(Cache.getDefault("PROXY_AUTH_PASSWORD", ""));
+ setCustomProxyEnabled();
defaultBrowser.setText(Cache.getDefault("DEFAULT_BROWSER", ""));
Cache.applicationProperties.setProperty("DEFAULT_URL",
sequenceUrlLinks.getPrimaryUrlId());
+ // Proxy settings
Cache.applicationProperties.setProperty("USE_PROXY",
- customProxy.isSelected() ? "true"
- : noProxy.isSelected() ? "none" : "false");
-
+ customProxy.isSelected() ? Cache.PROXYTYPE_CUSTOM
+ : noProxy.isSelected() ? Cache.PROXYTYPE_NONE
+ : Cache.PROXYTYPE_SYSTEM);
Cache.setOrRemove("PROXY_SERVER", proxyServerHttpTB.getText());
-
Cache.setOrRemove("PROXY_PORT", proxyPortHttpTB.getText());
-
Cache.setOrRemove("PROXY_SERVER_HTTPS", proxyServerHttpsTB.getText());
-
Cache.setOrRemove("PROXY_PORT_HTTPS", proxyPortHttpsTB.getText());
-
- if (noProxy.isSelected())
- {
- Cache.log.warn("Setting no proxy settings");
- Cache.setProxyProperties(null, null, null, null);
- }
- else if (customProxy.isSelected())
- {
- Cache.log.warn("Setting custom proxy settings");
- Cache.setProxyProperties(proxyServerHttpTB.getText(),
- proxyPortHttpTB.getText(), proxyServerHttpsTB.getText(),
- proxyPortHttpsTB.getText());
- }
- else // systemProxy should be selected and is sensible default
- {
- Cache.log.warn("Setting system proxy settings");
- Cache.resetProxyProperties();
- }
+ Cache.setOrRemove("PROXY_AUTH",
+ Boolean.toString(proxyAuth.isSelected()));
+ Cache.setOrRemove("PROXY_AUTH_USERNAME", proxyAuthUsernameTB.getText());
+ Cache.setOrRemove("PROXY_AUTH_PASSWORD", proxyAuthPasswordTB.getText());
+ setProxyFromSettings();
Cache.setProperty("VERSION_CHECK",
Boolean.toString(versioncheck.isSelected()));
}
}
+ public void setProxyFromSettings()
+ {
+ String proxyType = Cache.getDefault("USE_PROXY",
+ Cache.PROXYTYPE_SYSTEM);
+ if (proxyType.equals(Cache.PROXYTYPE_NONE))
+ {
+ if (!previousProxyType.equals(proxyType))
+ Cache.log.info("Setting no proxy settings");
+ Cache.setProxyProperties(null, null, null, null, null, null, null,
+ null);
+ }
+ else if (proxyType.equals(Cache.PROXYTYPE_CUSTOM))
+ {
+ if (!previousProxyType.equals(proxyType))
+ Cache.log.info("Setting custom proxy settings");
+ boolean proxyAuthSet = Cache.getDefault("PROXY_AUTH", false);
+ Cache.setProxyProperties(Cache.getDefault("PROXY_SERVER", null),
+ Cache.getDefault("PROXY_PORT", null),
+ Cache.getDefault("PROXY_SERVER_HTTPS", null),
+ Cache.getDefault("PROXY_PORT_HTTPS", null),
+ proxyAuthSet ? Cache.getDefault("PROXY_AUTH_USERNAME", "")
+ : null,
+ proxyAuthSet ? Cache.getDefault("PROXY_AUTH_PASSWORD", "")
+ : null);
+ }
+ else // systemProxy should be selected and is sensible default anyway
+ {
+ if (!previousProxyType.equals(proxyType))
+ Cache.log.info("Setting system proxy settings");
+ Cache.resetProxyProperties();
+ }
+ }
+
/**
* Do any necessary validation before saving settings. Return focus to the
* first tab which fails validation.