Allow disable telemetry from BrandingConstants

Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>

Author: mgaffigan

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

@@ -40,4 +40,8 @@ public class BrandingConstants {
     // These images must be at 215px x 30px scale
     public static final ImageIcon LOGO = new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/branding/oie_logo_banner_text_215x30.png"));
     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"));
+
+    public static final boolean CENTRAL_USER_REGISTRATION = true;
+    public static final boolean CHECK_FOR_NOTIFICATIONS = true;
+    public static final boolean SEND_USAGE_STATISTICS = true;
 }

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

@@ -48,8 +48,17 @@ public FirstLoginDialog(User currentUser) {
 
         userEditPanel.setUser(this, currentUser);
         userEditPanel.setRequiredFields(false, true);
-        if (currentUser.getId() == 1) {
+        if (BrandingConstants.CENTRAL_USER_REGISTRATION) {
+            if (currentUser.getId() == 1) {
+                // When CENTRAL_USER_REGISTRATION is set, registration is compulsatory
+                // for the first user of the system.
+                registerCheckBox.setVisible(false);
+            }
+        } else {
             registerCheckBox.setVisible(false);
+            registerCheckBox.setSelected(false);
+            userConsentCheckBox.setVisible(false);
+            userConsentCheckBox.setSelected(false);
         }
 
         jLabel2.setForeground(UIConstants.HEADER_TITLE_TEXT_COLOR);
@@ -273,7 +282,7 @@ private void finishButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
                 return;
             }
 
-            if (registerCheckBox.isSelected()) {
+            if (registerCheckBox.isSelected() && BrandingConstants.CENTRAL_USER_REGISTRATION) {
                 parent.registerUser(user);
             }
 

client/src/com/mirth/connect/client/ui/Frame.java

@@ -1250,7 +1250,9 @@ private void createOtherPane() {
         otherPane.setTitle("Other");
         otherPane.setName(TaskConstants.OTHER_KEY);
         otherPane.setFocusable(false);
-        addTask(TaskConstants.OTHER_NOTIFICATIONS, UIConstants.VIEW_NOTIFICATIONS, String.format("View notifications from %s.", BrandingConstants.PRODUCT_NAME), "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/flag_orange.png")), otherPane, null);
+        if (BrandingConstants.CHECK_FOR_NOTIFICATIONS) {
+            addTask(TaskConstants.OTHER_NOTIFICATIONS, UIConstants.VIEW_NOTIFICATIONS, String.format("View notifications from %s.", BrandingConstants.PRODUCT_NAME), "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/flag_orange.png")), otherPane, null);
+        }
         addTask(TaskConstants.OTHER_VIEW_USER_API, "View User API", String.format("View documentation for the %s User API.", BrandingConstants.PRODUCT_NAME), "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/page_white_text.png")), otherPane, null);
         addTask(TaskConstants.OTHER_VIEW_CLIENT_API, "View Client API", String.format("View documentation for the %s Client API.", BrandingConstants.PRODUCT_NAME), "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/page_white_text.png")), otherPane, null);
         addTask(TaskConstants.OTHER_HELP, "Help", String.format("View help for %s.", BrandingConstants.PRODUCT_NAME), "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/help.png")), otherPane, null);
@@ -1972,6 +1974,10 @@ public void done() {
     }
 
     public void sendUsageStatistics() {
+        if (!BrandingConstants.SEND_USAGE_STATISTICS) {
+            return;
+        }
+
         UpdateSettings updateSettings = null;
         try {
             updateSettings = mirthClient.getUpdateSettings();

client/src/com/mirth/connect/client/ui/LoginPanel.java

@@ -609,7 +609,8 @@ private boolean handleSuccess(LoginStatus loginStatus) throws ClientException {
 
                     // Check for new notifications from update server if enabled
                     String checkForNotifications = userPreferences.getProperty("checkForNotifications");
-                    if (checkForNotifications == null || BooleanUtils.toBoolean(checkForNotifications)) {
+                    if (BrandingConstants.CHECK_FOR_NOTIFICATIONS 
+                        && (checkForNotifications == null || BooleanUtils.toBoolean(checkForNotifications))) {
                         Set<Integer> archivedNotifications = new HashSet<Integer>();
                         String archivedNotificationString = userPreferences.getProperty("archivedNotifications");
                         if (archivedNotificationString != null) {

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

@@ -9,4 +9,7 @@ public class BrandingConstants {
     public static final String CLIENT_CONNECTION_HEADER = "openintegrationengine-client";
 
     public static final String SERVER_CERTIFICATE_CN = "oie-engine";
+
+    public static final String CONNECT_SERVER_URL = "https://connect.openintegrationengine.org";
+    public static final boolean SEND_USAGE_STATISTICS = true;
 }

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

@@ -42,13 +42,14 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mirth.connect.client.core.BrandingConstants;
 import com.mirth.connect.model.User;
 import com.mirth.connect.model.converters.ObjectXMLSerializer;
 import com.mirth.connect.model.notification.Notification;
 import com.mirth.connect.util.MirthSSLUtil;
 
 public class ConnectServiceUtil {
-    private final static String URL_CONNECT_SERVER = "https://connect.mirthcorp.com";
+    private final static String URL_CONNECT_SERVER = BrandingConstants.CONNECT_SERVER_URL;
     private final static String URL_REGISTRATION_SERVLET = "/RegistrationServlet";
     private final static String URL_USAGE_SERVLET = "/UsageStatisticsServlet";
     private final static String URL_NOTIFICATION_SERVLET = "/NotificationServlet";
@@ -233,14 +234,11 @@ public static boolean sendStatistics(String serverId, String mirthVersion, boole
     }
 
     private static CloseableHttpClient getClient(String[] protocols, String[] cipherSuites) {
-        RegistryBuilder<ConnectionSocketFactory> socketFactoryRegistry = RegistryBuilder.<ConnectionSocketFactory> create();
-        String[] enabledProtocols = MirthSSLUtil.getEnabledHttpsProtocols(protocols);
-        String[] enabledCipherSuites = MirthSSLUtil.getEnabledHttpsCipherSuites(cipherSuites);
-        SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(SSLContexts.createSystemDefault(), enabledProtocols, enabledCipherSuites, SSLConnectionSocketFactory.STRICT_HOSTNAME_VERIFIER);
-        socketFactoryRegistry.register("https", sslConnectionSocketFactory);
-
-        BasicHttpClientConnectionManager httpClientConnectionManager = new BasicHttpClientConnectionManager(socketFactoryRegistry.build());
+        BasicHttpClientConnectionManager httpClientConnectionManager = new BasicHttpClientConnectionManager();
         httpClientConnectionManager.setSocketConfig(SocketConfig.custom().setSoTimeout(TIMEOUT).build());
-        return HttpClients.custom().setConnectionManager(httpClientConnectionManager).build();
+        return HttpClients.custom()
+            .useSystemProperties()
+            .setConnectionManager(httpClientConnectionManager)
+            .build();
     }
 }

server/src/com/mirth/connect/server/Mirth.java

@@ -401,8 +401,10 @@ public void startup() {
         printSplashScreen();
 
         // schedule usage statistics to be sent at startup and every 24 hours
-        Timer timer = new Timer();
-        timer.schedule(new UsageSenderTask(), 0, ConnectServiceUtil.MILLIS_PER_DAY);
+        if (BrandingConstants.SEND_USAGE_STATISTICS) {
+            Timer timer = new Timer();
+            timer.schedule(new UsageSenderTask(), 0, ConnectServiceUtil.MILLIS_PER_DAY);
+        }
     }
 
     /**