MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-99923 Proxy settings: if one credentials dialog is shown do not show another right away

Browse Source 
(+ some preparations for automatic tests)
This commit is contained in:
irengrig
2013-01-31 16:15:41 +04:00
parent 5e69ea09ab
commit 6136087feb
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
+19
View File
@@ -77,6 +77,8 @@ public class HttpConfigurable implements PersistentStateComponent<HttpConfigurab
private transient final Object myLock = new Object();
private IdeaWideProxySelector mySelector;
private IdeaWideAuthenticator myAuthenticator;
public transient Getter<PasswordAuthentication> myTestAuthRunnable = new StaticGetter<PasswordAuthentication>(null);
public transient Getter<PasswordAuthentication> myTestGenericAuthRunnable = new StaticGetter<PasswordAuthentication>(null);
public static HttpConfigurable getInstance() {
return ServiceManager.getService(HttpConfigurable.class);
@@ -187,9 +189,18 @@ public class HttpConfigurable implements PersistentStateComponent<HttpConfigurab
}
public PasswordAuthentication getGenericPromptedAuthentication(final String prefix, final String host, final String prompt, final int port, final boolean remember) {
if (ApplicationManager.getApplication().isUnitTestMode()) {
return myTestGenericAuthRunnable.get();
}
final PasswordAuthentication[] value = new PasswordAuthentication[1];
final Runnable runnable = new Runnable() {
public void run() {
if (isGenericPasswordCanceled(host, port)) return;
final PasswordAuthentication password = getGenericPassword(host, port);
if (password != null) {
value[0] = password;
return;
}
final AuthenticationDialog dlg = new AuthenticationDialog(PopupUtil.getActiveComponent(), prefix + host,
"Please enter credentials for: " + prompt, "", "", remember);
dlg.show();
@@ -218,10 +229,18 @@ public class HttpConfigurable implements PersistentStateComponent<HttpConfigurab
if (ApplicationManager.getApplication() == null || ApplicationManager.getApplication().isDisposeInProgress() ||
ApplicationManager.getApplication().isDisposed()) return null;
if (ApplicationManager.getApplication().isUnitTestMode()) {
return myTestGenericAuthRunnable.get();
}
final String login = PROXY_LOGIN == null ? "" : PROXY_LOGIN;
final PasswordAuthentication[] value = new PasswordAuthentication[1];
final Runnable runnable = new Runnable() {
public void run() {
if (AUTHENTICATION_CANCELLED) return;
if (! StringUtil.isEmptyOrSpaces(PROXY_LOGIN) && ! StringUtil.isEmptyOrSpaces(password)) {
value[0] = new PasswordAuthentication(PROXY_LOGIN, password.toCharArray());
return;
}
final AuthenticationDialog dlg = new AuthenticationDialog(PopupUtil.getActiveComponent(), "Proxy authentication: " + host,
"Please enter credentials for: " + prompt, login, "", KEEP_PROXY_PASSWORD);
dlg.show();