From 7a55f6875f5244e926bae525865bfc702877548e Mon Sep 17 00:00:00 2001
From: bwssystems <info@bwssystems.com>
Date: Sat, 14 Jan 2017 15:39:09 -0600
Subject: [PATCH] Fixing issues with beta, reverted back to Spark 2.3

---
 pom.xml                                        |  2 +-
 .../HABridge/plugins/harmony/HarmonyHome.java  |  2 +-
 src/main/resources/public/scripts/app.js       | 18 +++++++++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1c04e03..950776c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
 		<dependency>
 		    <groupId>com.sparkjava</groupId>
 		    <artifactId>spark-core</artifactId>
-		    <version>2.5.4</version>
+		    <version>2.3</version>
 		    <exclusions>
 		    	<exclusion>
 		    		<artifactId>slf4j-simple</artifactId>
diff --git a/src/main/java/com/bwssystems/HABridge/plugins/harmony/HarmonyHome.java b/src/main/java/com/bwssystems/HABridge/plugins/harmony/HarmonyHome.java
index 6ff61e2..0c099d4 100644
--- a/src/main/java/com/bwssystems/HABridge/plugins/harmony/HarmonyHome.java
+++ b/src/main/java/com/bwssystems/HABridge/plugins/harmony/HarmonyHome.java
@@ -135,7 +135,7 @@ public class HarmonyHome implements Home {
 		} else {
 			if(anItem.getType().trim().equalsIgnoreCase(DeviceMapTypes.HARMONY_ACTIVITY[DeviceMapTypes.typeIndex]))
 			{
-				RunActivity anActivity = aGsonHandler.fromJson(anItem.getItem().toString(), RunActivity.class);
+				RunActivity anActivity = aGsonHandler.fromJson(anItem.getItem().getAsString(), RunActivity.class);
 				if(anActivity.getHub() == null || anActivity.getHub().isEmpty())
 					anActivity.setHub(device.getTargetDevice());
 				HarmonyHandler myHarmony = getHarmonyHandler(anActivity.getHub());
diff --git a/src/main/resources/public/scripts/app.js b/src/main/resources/public/scripts/app.js
index c268ec8..9c6dda7 100644
--- a/src/main/resources/public/scripts/app.js
+++ b/src/main/resources/public/scripts/app.js
@@ -733,10 +733,18 @@ app.service ('bridgeService', function ($http, $window, ngToast) {
 	};
 
 	this.buildUrls = function (onpayload, dimpayload, offpayload, isObject, anId, deviceName, deviceTarget, deviceType, deviceMapType, count, delay) {
-		var currentOn = self.state.device.onUrl;
-		var currentDim = self.state.device.dimUrl;
-		var currentOff = self.state.device.offUrl;
-		if (self.state.device.mapType !== undefined && self.state.device.mapType !== null && self.state.device.mapType !== "") {
+		var currentOn = "";
+		var currentDim = "";
+		var currentOff = "";
+		if (self.state.device !== undefined && self.state.device !== null) {
+			if (self.state.device.onUrl !== undefined && self.state.device.onUrl !== null)
+				currentOn = self.state.device.onUrl;
+			if (self.state.device.dimUrl !== undefined && self.state.device.dimUrl !== null)
+				currentDim = self.state.device.dimUrl;
+			if (self.state.device.offUrl !== undefined && self.state.device.offnUrl !== null)
+				currentOff = self.state.device.offUrl;
+		}
+		if (self.state.device !== undefined && self.state.device !== null && self.state.device.mapType !== undefined && self.state.device.mapType !== null && self.state.device.mapType !== "") {
 			self.state.device.mapId = self.state.device.mapId + "-" + anId;
 			if (dimpayload !== null) {
 				if (currentDim.indexOf("{\"item") !== 1 ) {
@@ -764,7 +772,7 @@ app.service ('bridgeService', function ($http, $window, ngToast) {
 					currentOff = "[{\"item\":\"" + currentOff + "\",\"type\":\"" + deviceMapType + "\"}]";
 			}
 			self.state.device.offUrl = currentOff.substr(0, currentOff.indexOf("]")) + ",{\"item\":";		
-		} else if (self.state.device.mapType === undefined || self.state.device.mapType === null || self.state.device.mapType === "") {
+		} else if (self.state.device === undefined || self.state.device === null || self.state.device.mapType === undefined || self.state.device.mapType === null || self.state.device.mapType === "") {
 			this.clearDevice();
 			self.state.device.deviceType = deviceType;
 			self.state.device.name = deviceName;