Updated C/F setting. Started to implement UTF-8

pom.xml

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

src/main/java/com/bwssystems/HABridge/BridgeSettings.java

@@ -40,12 +40,14 @@ public class BridgeSettings extends BackupHandler {
         String addressString = null;
         String theVeraAddress = null;
         String theHarmonyAddress = null;
+
         String configFileProperty = System.getProperty("config.file");
         if(configFileProperty == null) {
         	Path filePath = Paths.get(Configuration.CONFIG_FILE);
         	if(Files.exists(filePath) && Files.isReadable(filePath))
         		configFileProperty = Configuration.CONFIG_FILE;
         }
+
         if(configFileProperty != null)
         {
         	log.info("reading from config file: " + configFileProperty);
@@ -56,6 +58,7 @@ public class BridgeSettings extends BackupHandler {
         {
         	log.info("reading from system properties");
         	theBridgeSettings.setNumberoflogmessages(Configuration.NUMBER_OF_LOG_MESSAGES);
+        	theBridgeSettings.setFarenheit(true);
         	theBridgeSettings.setConfigfile(Configuration.CONFIG_FILE);
         	theBridgeSettings.setServerPort(System.getProperty("server.port", Configuration.DEFAULT_WEB_PORT));
         	theBridgeSettings.setUpnpConfigAddress(System.getProperty("upnp.config.address"));
@@ -182,6 +185,8 @@ public class BridgeSettings extends BackupHandler {
 		theBridgeSettings.setVeraconfigured(aBridgeSettings.isValidVera());
 		theBridgeSettings.setHarmonyconfigured(aBridgeSettings.isValidHarmony());
 		theBridgeSettings.setNestConfigured(aBridgeSettings.isValidNest());
+		theBridgeSettings.setNumberoflogmessages(aBridgeSettings.getNumberoflogmessages());
+		theBridgeSettings.setFarenheit(aBridgeSettings.isFarenheit());
     }
 
 	public void save(BridgeSettingsDescriptor newBridgeSettings) {

src/main/java/com/bwssystems/HABridge/BridgeSettingsDescriptor.java

@@ -19,6 +19,7 @@ public class BridgeSettingsDescriptor {
 	private boolean veraconfigured;
 	private boolean harmonyconfigured;
 	private boolean nestconfigured;
+	private boolean farenheit;
 	private String configfile;
 	private Integer numberoflogmessages;
 	
@@ -29,6 +30,7 @@ public class BridgeSettingsDescriptor {
 		this.nestconfigured = false;
 		this.veraconfigured = false;
 		this.harmonyconfigured = false;
+		this.farenheit = true;
 	}
 	public String getUpnpConfigAddress() {
 		return upnpconfigaddress;
@@ -144,6 +146,12 @@ public class BridgeSettingsDescriptor {
 	public void setNumberoflogmessages(Integer numberoflogmessages) {
 		this.numberoflogmessages = numberoflogmessages;
 	}
+	public boolean isFarenheit() {
+		return farenheit;
+	}
+	public void setFarenheit(boolean farenheit) {
+		this.farenheit = farenheit;
+	}
 	public Boolean isValidVera() {
 		if(this.getVeraAddress() == null || this.getVeraAddress().getDevices().size() <= 0)
 			return false;

src/main/java/com/bwssystems/HABridge/hue/HueMulator.java

@@ -395,7 +395,10 @@ public class HueMulator {
 		        	NestInstruction thermoSetting = new Gson().fromJson(url, NestInstruction.class);
 	        		if(thermoSetting.getControl().equalsIgnoreCase("temp")) {
 	        			if(request.body().contains("bri")) {
-	        				thermoSetting.setTemp(String.valueOf((Double.parseDouble(replaceIntensityValue(thermoSetting.getTemp(), state.getBri())) - 32.0)/1.8));
+	        				if(bridgeSettings.isFarenheit())
+	        					thermoSetting.setTemp(String.valueOf((Double.parseDouble(replaceIntensityValue(thermoSetting.getTemp(), state.getBri())) - 32.0)/1.8));
+	        				else
+	        					thermoSetting.setTemp(String.valueOf(Double.parseDouble(replaceIntensityValue(thermoSetting.getTemp(), state.getBri()))));
 	        				log.debug("Setting thermostat: " + thermoSetting.getName() + " to " + thermoSetting.getTemp() + "C");
 	        				theNest.getThermostat(thermoSetting.getName()).setTargetTemperature(Float.parseFloat(thermoSetting.getTemp()));
 	        			}

src/main/java/com/bwssystems/vera/VeraInfo.java

@@ -1,6 +1,7 @@
 package com.bwssystems.vera;
 
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.HashMap;
 import java.util.ListIterator;
 import java.util.Map;
@@ -101,7 +102,7 @@ public class VeraInfo {
             HttpResponse response = httpClient.execute(httpGet);
             log.debug("GET on URL responded: " + response.getStatusLine().getStatusCode());
             if(response.getStatusLine().getStatusCode() == 200){
-                theContent = EntityUtils.toString(response.getEntity()); //read content for data
+                theContent = EntityUtils.toString(response.getEntity(), Charset.forName("UTF-8")); //read content for data
                 EntityUtils.consume(response.getEntity()); //close out inputstream ignore content
             }
         } catch (IOException e) {

src/main/resources/public/views/system.html

@@ -173,6 +173,11 @@
 					<td><input type="checkbox" ng-model="bridge.settings.traceupnp"
            				ng-true-value=true ng-false-value=false>  {{bridge.settings.traceupnp}}</td>
 				</tr>
+				<tr>
+					<td>Nest Temp Farenheit</td>
+					<td><input type="checkbox" ng-model="bridge.settings.farenheit"
+           				ng-true-value=true ng-false-value=false>  {{bridge.settings.farenheit}}</td>
+				</tr>
 			</table>
 			</form>
 		</div>