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

Fixed problems with invoking prompt to enter master password during progress tasks

Browse Source
This commit is contained in:
Oleg Shpynov
2011-04-19 20:26:00 +04:00
parent eb324698b0
commit b293c2219f
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
+2 -1
View File
@@ -92,13 +92,14 @@ public class GithubShareAction extends DumbAwareAction {
}
final GithubSettings settings = GithubSettings.getInstance();
final String password = settings.getPassword();
final boolean privateRepoAllowed;
try {
privateRepoAllowed = GithubUtil.accessToGithubWithModalProgress(project, new Computable<Boolean>() {
@Override
public Boolean compute() {
ProgressManager.getInstance().getProgressIndicator().setText("Trying to login to GitHub");
return GithubUtil.isPrivateRepoAllowed(settings.getHost(), settings.getLogin(), settings.getPassword());
return GithubUtil.isPrivateRepoAllowed(settings.getHost(), settings.getLogin(), password);
}
});
}
plugins/github/src/org/jetbrains/plugins/github/GithubUtil.java
+21 -6
View File
@@ -229,13 +229,23 @@ public class GithubUtil {
return false;
}
try {
return accessToGithubWithModalProgress(project, new Computable<Boolean>() {
if (accessToGithubWithModalProgress(project, new Computable<Boolean>() {
@Override
public Boolean compute() {
ProgressManager.getInstance().getProgressIndicator().setText("Trying to login to GitHub");
if (url != null && login != null && password != null){
return testConnection(url, login, password);
}
return false;
}
})) {
return true;
}
return accessToGithubWithModalProgress(project, new Computable<Boolean>() {
@Override
public Boolean compute() {
ProgressManager.getInstance().getProgressIndicator().setText("Trying to login to GitHub");
final GithubSettings settings = GithubSettings.getInstance();
return testConnection(settings.getHost(), settings.getLogin(), settings.getPassword());
}
@@ -256,13 +266,14 @@ public class GithubUtil {
@Nullable
public static List<RepositoryInfo> getAvailableRepos(final Project project, final boolean ownOnly) {
final GithubSettings settings = GithubSettings.getInstance();
final String password = settings.getPassword();
final boolean validCredentials;
try {
validCredentials = accessToGithubWithModalProgress(project, new Computable<Boolean>() {
@Override
public Boolean compute() {
ProgressManager.getInstance().getProgressIndicator().setText("Trying to login to GitHub");
return testConnection(settings.getHost(), settings.getLogin(), settings.getPassword());
return testConnection(settings.getHost(), settings.getLogin(), password);
}
});
}
@@ -278,11 +289,12 @@ public class GithubUtil {
}
// Otherwise our credentials are valid and they are successfully stored in settings
try {
final String validPassword = settings.getPassword();
return accessToGithubWithModalProgress(project, new Computable<List<RepositoryInfo>>() {
@Override
public List<RepositoryInfo> compute() {
ProgressManager.getInstance().getProgressIndicator().setText("Extracting info about available repositories");
return getAvailableRepos(settings.getHost(), settings.getLogin(), settings.getPassword(), ownOnly);
return getAvailableRepos(settings.getHost(), settings.getLogin(), validPassword, ownOnly);
}
});
}
@@ -299,13 +311,14 @@ public class GithubUtil {
@Nullable
public static RepositoryInfo getDetailedRepositoryInfo(final Project project, final String owner, final String name) {
final GithubSettings settings = GithubSettings.getInstance();
final String password = settings.getPassword();
final boolean validCredentials;
try {
validCredentials = accessToGithubWithModalProgress(project, new Computable<Boolean>() {
@Override
public Boolean compute() {
ProgressManager.getInstance().getProgressIndicator().setText("Trying to login to GitHub");
return testConnection(settings.getHost(), settings.getLogin(), settings.getPassword());
return testConnection(settings.getHost(), settings.getLogin(), password);
}
});
}
@@ -321,11 +334,12 @@ public class GithubUtil {
}
// Otherwise our credentials are valid and they are successfully stored in settings
try {
final String validPassword = settings.getPassword();
return accessToGithubWithModalProgress(project, new Computable<RepositoryInfo>() {
@Override
public RepositoryInfo compute() {
ProgressManager.getInstance().getProgressIndicator().setText("Extracting detailed info about repository ''" + name + "''");
return getDetailedRepoInfo(settings.getHost(), settings.getLogin(), settings.getPassword(), owner, name);
return getDetailedRepoInfo(settings.getHost(), settings.getLogin(), validPassword, owner, name);
}
});
}
@@ -365,11 +379,12 @@ public class GithubUtil {
public static boolean isWriteAccessAllowed(final Project project, final RepositoryInfo repo) {
final GithubSettings settings = GithubSettings.getInstance();
final String password = settings.getPassword();
return accessToGithubWithModalProgress(project, new Computable<Boolean>() {
@Override
public Boolean compute() {
ProgressManager.getInstance().getProgressIndicator().setText("Extracting info about pushable repositories");
return isPushableRepo(settings.getHost(), settings.getLogin(), settings.getPassword(), repo);
return isPushableRepo(settings.getHost(), settings.getLogin(), password, repo);
}
});
}