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

[platform] avoids resetting "use secure connection" option when SNI is disabled

Browse Source
This commit is contained in:
Roman Shevchenko
2018-04-23 15:28:13 +02:00
parent 3387597e00
commit 91d8171272
2 changed files with 6 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateCheckerComponent.java
+4 -32
View File
@@ -1,34 +1,16 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.updateSettings.impl;
import com.intellij.ide.AppLifecycleListener;
import com.intellij.ide.IdeBundle;
import com.intellij.notification.Notification;
import com.intellij.notification.NotificationListener;
import com.intellij.notification.NotificationType;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationInfo;
import com.intellij.openapi.application.ConfigImportHelper;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.application.ex.ApplicationInfoEx;
import com.intellij.openapi.components.ApplicationComponent;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.options.ShowSettingsUtil;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.Task;
import com.intellij.openapi.updateSettings.UpdateStrategyCustomization;
@@ -40,8 +22,6 @@ import com.intellij.util.Alarm;
import com.intellij.util.text.DateFormatUtil;
import org.jetbrains.annotations.NotNull;
import javax.swing.event.HyperlinkEvent;
import static java.lang.Math.max;
/**
@@ -61,7 +41,7 @@ public class UpdateCheckerComponent implements Disposable, ApplicationComponent
mySettings = settings;
updateDefaultChannel();
checkSecureConnection(app);
checkSecureConnection();
scheduleOnStartCheck(app);
cleanupPatch();
}
@@ -87,19 +67,11 @@ public class UpdateCheckerComponent implements Disposable, ApplicationComponent
}
}
private void checkSecureConnection(Application app) {
private void checkSecureConnection() {
if (mySettings.isSecureConnection() && !mySettings.canUseSecureConnection()) {
mySettings.setSecureConnection(false);
String title = IdeBundle.message("update.notifications.title");
String message = IdeBundle.message("update.sni.disabled.message");
UpdateChecker.NOTIFICATIONS.createNotification(title, message, NotificationType.WARNING, new NotificationListener.Adapter() {
@Override
protected void hyperlinkActivated(@NotNull Notification notification, @NotNull HyperlinkEvent e) {
notification.expire();
app.invokeLater(() -> ShowSettingsUtil.getInstance().showSettingsDialog(null, UpdateSettingsConfigurable.class), ModalityState.NON_MODAL);
}
}).notify(null);
UpdateChecker.NOTIFICATIONS.createNotification(title, message, NotificationType.WARNING, null).notify(null);
}
}
platform/platform-resources-en/src/messages/IdeBundle.properties
+2 -2
View File
@@ -999,8 +999,8 @@ update.shutdown.plugins.update.action=&Update and Shutdown
update.channel.enforced=Update channel switched to ''{0}''
update.sni.disabled.error=Secure connection is impossible with 'jsse.enableSNIExtension' property set to false
update.sni.disabled.message=We wanted your IDE to receive upgrades over a secure connection. \
Unfortunately, this doesn't work with the 'jsse.enableSNIExtension' property set to 'false', so the option was disabled. \
You can enable it again in <a href="disable">settings</a> after setting the property to 'true'.
Unfortunately, this doesn't work with the 'jsse.enableSNIExtension' property set to 'false'. \
The IDE will use plain HTTP connections when checking for updates.
update.apply.manually.message=Unfortunately, the IDE is not capable of an automatic update on your system.\n \
Please quit the IDE and apply the patch manually by launching this script:\n{0}.
update.ready.message=The IDE is ready for update. <a href="#">Restart</a>?