Fix some bugs for brightness decode in tcp and udp plugins

Fixes #434
Fixes #435

README.md

@@ -33,23 +33,23 @@ ATTENTION: This requires JDK 1.8 to run
 ATTENTION: Due to port 80 being the default, Linux restricts this to super user. Use the instructions below.
 
 ```
-java -jar ha-bridge-4.1.1.jar
+java -jar ha-bridge-4.1.3.jar
 ```
 ### Automation on Linux systems
 To have this configured and running automatically there are a few resources to use. One is using Docker and a docker container has been built for this and can be gotten here: https://github.com/aptalca/docker-ha-bridge
 
-Create the directory and make sure that ha-bridge-4.1.1.jar is in your /home/pi/habridge directory.
+Create the directory and make sure that ha-bridge-4.1.3.jar is in your /home/pi/habridge directory.
 ```
 pi@raspberrypi:~ $ mkdir habridge
 pi@raspberrypi:~ $ cd habridge
 
-pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.1/ha-bridge-4.1.1.jar
+pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.3/ha-bridge-4.1.3.jar
 ```
-Create the directory and make sure that ha-bridge-4.1.1.jar is in your /home/pi/habridge directory.
+Create the directory and make sure that ha-bridge-4.1.3.jar is in your /home/pi/habridge directory.
 ```
 pi@raspberrypi:~ $ mkdir habridge
 pi@raspberrypi:~ $ cd habridge
-pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.1/ha-bridge-4.1.1.jar
+pi@raspberrypi:~/habridge $ wget https://github.com/bwssytems/ha-bridge/releases/download/v4.1.3/ha-bridge-4.1.3.jar
 ```
 #### System Control Setup on a pi (preferred)
 For next gen Linux systems (this includes the Raspberry Pi), here is a systemctl unit file that you can install. Here is a link on how to do this: https://www.digitalocean.com/community/tutorials/how-to-use-systemctl-to-manage-systemd-services-and-units
@@ -69,7 +69,7 @@ After=network.target
 [Service]
 Type=simple
 
-ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.1.jar
+ExecStart=/usr/bin/java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.3.jar
 
 [Install]
 WantedBy=multi-user.target
@@ -104,7 +104,7 @@ Then cut and past this, modify any locations that are not correct
 ```
 cd /home/pi/habridge
 rm /home/pi/habridge/habridge-log.txt
-nohup java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.1.jar > /home/pi/habridge/habridge-log.txt 2>&1 &
+nohup java -jar -Dconfig.file=/home/pi/habridge/data/habridge.config /home/pi/habridge/ha-bridge-4.1.3.jar > /home/pi/habridge/habridge-log.txt 2>&1 &
 
 chmod 777 /home/pi/habridge/habridge-log.txt
 ```

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4.1.1</version>
+	<version>4.1.3</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>

src/main/java/com/bwssystems/HABridge/dao/DeviceDescriptor.java

@@ -220,19 +220,22 @@ public class DeviceDescriptor{
 	}
 
 	public boolean containsType(String aType) {
-		if(this.mapType.contains(aType))
+		if(aType == null)
+			return false;
+		
+		if(this.mapType != null && this.mapType.contains(aType))
 			return true;
 		
-		if(this.deviceType.contains(aType))
+		if(this.deviceType != null && this.deviceType.contains(aType))
 			return true;
 		
-		if(this.onUrl.contains(aType))
+		if(this.onUrl != null && this.onUrl.contains(aType))
 			return true;
 		
-		if(this.dimUrl.contains(aType))
+		if(this.dimUrl != null && this.dimUrl.contains(aType))
 			return true;
 		
-		if(this.offUrl.contains(aType))
+		if(this.offUrl != null && this.offUrl.contains(aType))
 			return true;
 		
 		return false;

src/main/java/com/bwssystems/HABridge/plugins/hal/HalInfo.java

@@ -149,8 +149,12 @@ public class HalInfo {
 			theData = httpClient.doHttpRequest(theUrl, null, null, null, null);
 			if (theData != null) {
 				log.debug("GET IrData for IR Device " + theHalDevice.getHaldevicename() + " HalApiResponse - data: " + theData);
-				theHalApiResponse = new Gson().fromJson(theData, DeviceElements.class);
-				if (theHalApiResponse.getDeviceElements() == null) {
+				try {
+					theHalApiResponse = new Gson().fromJson(theData, DeviceElements.class);
+				} catch (Exception e) {
+					theHalApiResponse = null;
+				}
+				if (theHalApiResponse == null || theHalApiResponse.getDeviceElements() == null) {
 					StatusDescription theStatus = new Gson().fromJson(theData, StatusDescription.class);
 					if (theStatus.getStatus() == null) {
 						log.warn("Cannot get buttons for IR Device " + theHalDevice.getHaldevicename() + " for hal "

src/main/java/com/bwssystems/HABridge/plugins/tcp/TCPHome.java

@@ -49,11 +49,12 @@ public class TCPHome implements Home {
 			// noop
 		}
 
-		theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, true);
 		theUrlBody = TimeDecode.replaceTimeValue(theUrlBody);
 		if (theUrlBody.startsWith("0x")) {
+			theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, true);
 			sendData = DatatypeConverter.parseHexBinary(theUrlBody.substring(2));
 		} else {
+			theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, false);
 			sendData = theUrlBody.getBytes();
 		}
 

src/main/java/com/bwssystems/HABridge/plugins/udp/UDPHome.java

@@ -51,11 +51,12 @@ public class UDPHome implements Home {
 			return null;
 		}
 
-		theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, true);
 		theUrlBody = TimeDecode.replaceTimeValue(theUrlBody);
 		if (theUrlBody.startsWith("0x")) {
+			theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, true);
 			sendData = DatatypeConverter.parseHexBinary(theUrlBody.substring(2));
 		} else {
+			theUrlBody = BrightnessDecode.calculateReplaceIntensityValue(theUrlBody, intensity, targetBri, targetBriInc, false);
 			sendData = theUrlBody.getBytes();
 		}
 		try {