From 363fb605a6fa3730aaa1215e1d5979513abfc1d4 Mon Sep 17 00:00:00 2001
From: Admin <info@bwssystems.com>
Date: Thu, 29 Dec 2016 16:16:01 -0600
Subject: [PATCH] Adding new things for 4beta2

---
 pom.xml                                                   | 2 +-
 .../com/bwssystems/HABridge/plugins/http/HTTPHandler.java | 2 +-
 src/main/resources/public/scripts/app.js                  | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 265db63..c25a20e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4beta1</version>
+	<version>4beta1.1</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java b/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java
index 07a3e73..ff27556 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/http/HTTPHandler.java
@@ -41,7 +41,7 @@ public class HTTPHandler {
 		// Trust own CA and all self-signed certs
 		sslcontext = SSLContexts.createDefault();
 		// Allow TLSv1 protocol only
-		sslsf = new SSLConnectionSocketFactory(sslcontext, new String[] { "TLSv1" }, null,
+		sslsf = new SSLConnectionSocketFactory(sslcontext, new String[] { "TLSv1,TLSv1.1,TLSv1.2" }, null,
 				SSLConnectionSocketFactory.getDefaultHostnameVerifier());
 		globalConfig = RequestConfig.custom().setCookieSpec(CookieSpecs.STANDARD).build();
 		httpclientSSL = HttpClients.custom().setSSLSocketFactory(sslsf).setDefaultRequestConfig(globalConfig).build();
diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js
index ea6085c..ab19b79 100644
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -1639,10 +1639,10 @@ app.controller('HalController', function ($scope, $location, $http, bridgeServic
 
 	$scope.buildHALFanUrls = function (haldevice) {
 		onpayload = "http://" + haldevice.haladdress 
-		+ "/HVACService!HVACCmd=Set!HVACName=" 
-		+ haldevice.haldevicename.replaceAll(" ", "%20") 
-		+ "!FanMode=On?Token="
-		+ $scope.bridge.settings.haltoken;
+			+ "/HVACService!HVACCmd=Set!HVACName=" 
+			+ haldevice.haldevicename.replaceAll(" ", "%20") 
+			+ "!FanMode=On?Token="
+			+ $scope.bridge.settings.haltoken;
 		offpayload = "http://" + haldevice.haladdress 
 			+ "/HVACService!HVACCmd=Set!HVACName=" 
 			+ haldevice.haldevicename.replaceAll(" ", "%20")