Skip to content

Commit 62207b6

Browse files
mgaffiganmgaffigan
committed
Address PR comments and remove dead usings
Signed-off-by: Mitch Gaffigan <[email protected]>
1 parent 346e1a4 commit 62207b6

File tree

4 files changed

+11
-12
lines changed

4 files changed

+11
-12
lines changed

‎client/src/com/mirth/connect/client/ui/BrandingConstants.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ public class BrandingConstants {
4141
public static final ImageIcon LOGO = new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/branding/oie_logo_banner_text_215x30.png"));
4242
public static final ImageIcon LOGO_GRAY = new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/branding/oie_white_logo_banner_text_215x30.png"));
4343

44-
public static final boolean CENTRAL_USER_REGISTRATION = true;
44+
public static final boolean CENTRAL_USER_REGISTRATION = false;
4545
public static final boolean MANDATORY_USER_REGISTRATION = false;
4646
public static final boolean CHECK_FOR_NOTIFICATIONS = true;
47-
public static final boolean SEND_USAGE_STATISTICS = true;
47+
public static final boolean SEND_USAGE_STATISTICS = false;
4848
}

‎client/src/com/mirth/connect/client/ui/FirstLoginDialog.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public FirstLoginDialog(User currentUser) {
5050
userEditPanel.setRequiredFields(false, true);
5151
if (BrandingConstants.CENTRAL_USER_REGISTRATION) {
5252
if (currentUser.getId() == 1 && BrandingConstants.MANDATORY_USER_REGISTRATION) {
53-
// When CENTRAL_USER_REGISTRATION is set, registration is compulsatory
53+
// When MANDATORY_USER_REGISTRATION is set, registration is compulsatory
5454
// for the first user of the system.
5555
registerCheckBox.setVisible(false);
5656
}
@@ -160,7 +160,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
160160
jScrollPane1.setViewportView(jTextPane1);
161161

162162
registerCheckBox.setBackground(new java.awt.Color(255, 255, 255));
163-
registerCheckBox.setSelected(true);
163+
registerCheckBox.setSelected(BrandingConstants.MANDATORY_USER_REGISTRATION);
164164
registerCheckBox.setText(String.format("Register user with %s", BrandingConstants.COMPANY_NAME));
165165
registerCheckBox.setToolTipText(String.format("<html>Register your user information with %s to help us<br>improve the product and provide better service.</html>", BrandingConstants.COMPANY_NAME));
166166
registerCheckBox.addActionListener(new java.awt.event.ActionListener() {
@@ -170,7 +170,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
170170
});
171171

172172
userConsentCheckBox.setBackground(new java.awt.Color(255, 255, 255));
173-
userConsentCheckBox.setSelected(true);
173+
userConsentCheckBox.setSelected(BrandingConstants.MANDATORY_USER_REGISTRATION);
174174
userConsentCheckBox.setText(String.format("I consent to receive email updates and marketing messages from %s.", BrandingConstants.COMPANY_NAME));
175175
userConsentCheckBox.setToolTipText("<html></html>");
176176

‎server/src/com/mirth/connect/client/core/BrandingConstants.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ public class BrandingConstants {
1111
public static final String SERVER_CERTIFICATE_CN = "oie-engine";
1212

1313
public static final String CONNECT_SERVER_URL = "https://connect.openintegrationengine.org";
14-
public static final boolean SEND_USAGE_STATISTICS = true;
14+
public static final String NOTIFICATIONS_URL = "https://api.github.com/repos/openintegrationengine/engine/releases";
15+
public static final boolean SEND_USAGE_STATISTICS = false;
1516
}

‎server/src/com/mirth/connect/client/core/ConnectServiceUtil.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,8 @@
3636
import org.apache.http.client.methods.HttpPost;
3737
import org.apache.http.client.protocol.HttpClientContext;
3838
import org.apache.http.client.utils.HttpClientUtils;
39-
import org.apache.http.config.RegistryBuilder;
4039
import org.apache.http.config.SocketConfig;
4140
import org.apache.http.conn.socket.ConnectionSocketFactory;
42-
import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
43-
import org.apache.http.conn.ssl.SSLContexts;
4441
import org.apache.http.entity.ContentType;
4542
import org.apache.http.impl.client.CloseableHttpClient;
4643
import org.apache.http.impl.client.HttpClients;
@@ -51,18 +48,19 @@
5148
import com.fasterxml.jackson.databind.JsonMappingException;
5249
import com.fasterxml.jackson.databind.JsonNode;
5350
import com.fasterxml.jackson.databind.ObjectMapper;
54-
import com.mirth.connect.client.core.BrandingConstants;
51+
5552
import com.github.zafarkhaja.semver.Version;
53+
54+
import com.mirth.connect.client.core.BrandingConstants;
5655
import com.mirth.connect.model.User;
5756
import com.mirth.connect.model.converters.ObjectXMLSerializer;
5857
import com.mirth.connect.model.notification.Notification;
59-
import com.mirth.connect.util.MirthSSLUtil;
6058

6159
public class ConnectServiceUtil {
6260
private final static String URL_CONNECT_SERVER = BrandingConstants.CONNECT_SERVER_URL;
6361
private final static String URL_REGISTRATION_SERVLET = "/RegistrationServlet";
6462
private final static String URL_USAGE_SERVLET = "/UsageStatisticsServlet";
65-
private static String URL_NOTIFICATIONS = "https://api.github.com/repos/openintegrationengine/engine/releases";
63+
private static String URL_NOTIFICATIONS = BrandingConstants.NOTIFICATIONS_URL;
6664
private final static int TIMEOUT = 10000;
6765
public final static Integer MILLIS_PER_DAY = 86400000;
6866

0 commit comments

Comments
 (0)