Skip to content

Issue #156 - Change SSL help text to a Constant, remove ads #164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonbartels merged 1 commit into from
Dec 4, 2025
Merged

Issue #156 - Change SSL help text to a Constant, remove ads #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions client/src/com/mirth/connect/connectors/http/HttpSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@

import javax.swing.BorderFactory;
import javax.swing.ButtonGroup;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JLabel;
import javax.swing.JScrollPane;
Expand Down Expand Up @@ -74,9 +73,11 @@

public class HttpSender extends ConnectorSettingsPanel {

private static final ImageIcon ICON_LOCK_X = new ImageIcon(Frame.class.getResource("images/lock_x.png"));
private static final Color COLOR_SSL_NOT_CONFIGURED = new Color(0xFFF099);
private static final String SSL_TOOL_TIP = "<html>The default system certificate store will be used for this connection.<br/>As a result, certain security options are not available and mutual<br/>authentication (two-way authentication) is not supported.</html>";
private static final String SSL_TOOL_TIP = """
<html>Compatible TLS plugin not detected. The java system trust store will be<br/>
used for this connection. TLS security options and mutual<br/>
authentication (mTLS) are not configurable through this interface.</html>""";

private final int NAME_COLUMN = 0;
private final int VALUE_COLUMN = 1;
Expand All @@ -85,7 +86,6 @@ public class HttpSender extends ConnectorSettingsPanel {
private int propertiesLastIndex = -1;
private int headerLastIndex = -1;
private Frame parent;
private SSLWarningPanel sslWarningPanel;

public HttpSender() {
this.parent = PlatformUI.MIRTH_FRAME;
Expand Down Expand Up @@ -114,8 +114,6 @@ public void keyReleased(KeyEvent evt) {
}
});

sslWarningPanel = new SSLWarningPanel();

contentTypeField.getDocument().addDocumentListener(new DocumentListener() {
@Override
public void insertUpdate(DocumentEvent e) {
Expand Down Expand Up @@ -691,7 +689,7 @@ public ConnectorTypeDecoration getConnectorTypeDecoration() {
}

if (usingHttps) {
return new ConnectorTypeDecoration(Mode.DESTINATION, "(SSL Not Configured)", ICON_LOCK_X, SSL_TOOL_TIP, sslWarningPanel, COLOR_SSL_NOT_CONFIGURED);
return new ConnectorTypeDecoration(Mode.DESTINATION, "(TLS Not Configured)", UIConstants.ICON_INFORMATION, SSL_TOOL_TIP, null, COLOR_SSL_NOT_CONFIGURED);
} else {
return new ConnectorTypeDecoration(Mode.DESTINATION);
}
Expand Down
63 changes: 0 additions & 63 deletions client/src/com/mirth/connect/connectors/http/SSLWarningPanel.java
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions client/src/com/mirth/connect/connectors/ws/SSLWarningPanel.java
View file
Open in desktop

This file was deleted.

12 changes: 5 additions & 7 deletions client/src/com/mirth/connect/connectors/ws/WebServiceSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import javax.swing.BorderFactory;
import javax.swing.ButtonGroup;
import javax.swing.DefaultComboBoxModel;
import javax.swing.ImageIcon;
import javax.swing.JButton;
import javax.swing.JComponent;
import javax.swing.JLabel;
Expand Down Expand Up @@ -83,9 +82,11 @@

public class WebServiceSender extends ConnectorSettingsPanel {

protected static final ImageIcon ICON_LOCK_X = new ImageIcon(Frame.class.getResource("images/lock_x.png"));
protected static final Color COLOR_SSL_NOT_CONFIGURED = new Color(0xFFF099);
protected static final String SSL_TOOL_TIP = "<html>The default system certificate store will be used for this connection.<br/>As a result, certain security options are not available and mutual<br/>authentication (two-way authentication) is not supported.</html>";
protected static final String SSL_TOOL_TIP = """
<html>Compatible TLS plugin not detected. The java system trust store will be<br/>
used for this connection. TLS security options and mutual<br/>
authentication (mTLS) are not configurable through this interface.</html>""";

private final int ID_COLUMN_NUMBER = 0;
private final int CONTENT_COLUMN_NUMBER = 1;
Expand Down Expand Up @@ -319,7 +320,7 @@ public void resetInvalidProperties() {
@Override
public ConnectorTypeDecoration getConnectorTypeDecoration() {
if (isUsingHttps(wsdlUrlField.getText()) || isUsingHttps(String.valueOf(locationURIComboBox.getSelectedItem()))) {
return new ConnectorTypeDecoration(Mode.DESTINATION, "(SSL Not Configured)", ICON_LOCK_X, SSL_TOOL_TIP, sslWarningPanel, COLOR_SSL_NOT_CONFIGURED);
return new ConnectorTypeDecoration(Mode.DESTINATION, "(TLS Not Configured)", UIConstants.ICON_INFORMATION, SSL_TOOL_TIP, null, COLOR_SSL_NOT_CONFIGURED);
} else {
return new ConnectorTypeDecoration(Mode.DESTINATION);
}
Expand Down Expand Up @@ -963,8 +964,6 @@ public void actionPerformed(ActionEvent evt) {
}
});

sslWarningPanel = new SSLWarningPanel();

useAttachmentsTableRadio = new MirthRadioButton("Use Table");
useAttachmentsTableRadio.setBackground(getBackground());
useAttachmentsTableRadio.addActionListener(new ActionListener() {
Expand Down Expand Up @@ -1505,5 +1504,4 @@ private void headersDeleteButtonActionPerformed(ActionEvent evt) {
protected MirthTextField attachmentsVariableField;
protected MirthRadioButton useAttachmentsTableRadio;
protected MirthRadioButton useAttachmentsVariableRadio;
protected SSLWarningPanel sslWarningPanel;
}