From f16a62005bcfddabc02b76f4683b0e2d473af415 Mon Sep 17 00:00:00 2001 From: Ivan Chirkov Date: Wed, 29 Jun 2016 12:24:16 +0200 Subject: [PATCH] Specify useForceHttps for RepositoryHelper.loadPlugins only in one method. --- .../com/intellij/ide/plugins/RepositoryHelper.java | 14 +------------- .../openapi/updateSettings/impl/UpdateChecker.kt | 3 +-- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java b/platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java index 6961dc4f1166..61561edc4a0f 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/RepositoryHelper.java @@ -95,26 +95,14 @@ public class RepositoryHelper { @NotNull public static List loadPlugins(@Nullable String repositoryUrl, @Nullable ProgressIndicator indicator) throws IOException { - boolean forceHttps = repositoryUrl == null && IdeaApplication.isLoaded() && UpdateSettings.getInstance().canUseSecureConnection(); - return loadPlugins(repositoryUrl, null, forceHttps, indicator); + return loadPlugins(repositoryUrl, null, indicator); } - /** - * Loads list of plugins, compatible with a given build, from a given plugin repository (main repository if null). - */ @NotNull public static List loadPlugins(@Nullable String repositoryUrl, @Nullable BuildNumber buildnumber, @Nullable ProgressIndicator indicator) throws IOException { boolean forceHttps = repositoryUrl == null && IdeaApplication.isLoaded() && UpdateSettings.getInstance().canUseSecureConnection(); - return loadPlugins(repositoryUrl, buildnumber, forceHttps, indicator); - } - - @NotNull - public static List loadPlugins(@Nullable String repositoryUrl, - @Nullable BuildNumber buildnumber, - boolean forceHttps, - @Nullable ProgressIndicator indicator) throws IOException { return loadPlugins(repositoryUrl, buildnumber, null, forceHttps, indicator); } diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt index 2061934fb44b..2c1a5598d515 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt @@ -221,8 +221,7 @@ object UpdateChecker { outer@ for (host in hosts) { try { - val forceHttps = host == null && updateSettings.canUseSecureConnection() - val list = RepositoryHelper.loadPlugins(host, buildNumber, forceHttps, indicator) + val list = RepositoryHelper.loadPlugins(host, buildNumber, indicator) for (descriptor in list) { val id = descriptor.pluginId if (updateable.containsKey(id)) {