Merge branch 'release/1.12'

darmbrust · Jan 14, 2021 · c08e19a · c08e19a
2 parents 2da0708 + a1d26d2
commit c08e19a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -85,6 +85,6 @@ There are lots of TODOs.... useful things I may add (pull requests welcome)
 
 Change version in WeatherLinkLiveGUI.java too
 ```
-mvn -B gitflow:release-start gitflow:release-finish -DreleaseVersion=1.11 -DdevelopmentVersion=1.12
+mvn -B gitflow:release-start gitflow:release-finish -DreleaseVersion=1.12 -DdevelopmentVersion=1.13
 
 ```
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>net.sagebits.weatherlink</groupId>
 	<artifactId>weatherlink</artifactId>
-	<version>1.11</version>
+	<version>1.12</version>
 	<packaging>jar</packaging>
 
 	<name>WeatherLink Logger and GUI</name>

diff --git a/src/main/java/net/sagebits/weatherlink/data/DataReader.java b/src/main/java/net/sagebits/weatherlink/data/DataReader.java
@@ -273,11 +273,11 @@ public static String stripHeaders(String input)
 	{
 		//There seems to be a bug, either with some WLL devices sending malformed headers - instead of ending in \r\n\r\n like they are supposed to, 
 		//they are sending \n\n in older firmware releases.  So, the headers aren't detected / removed by the URL library.
-		int endOfHeaderMarker = input.indexOf("\\n\\n");
+		int endOfHeaderMarker = input.indexOf("\n\n");
 		if (endOfHeaderMarker > 0 && endOfHeaderMarker < 40)
 		{
-			String result = input.substring(endOfHeaderMarker + 2);
-			log.debug("Removed '{}' from the beginning of the input, as it appears headers were still present", input.substring(0, (endOfHeaderMarker + 2)));
+			String result = input.substring(endOfHeaderMarker + "\n\n".length());
+			log.debug("Removed '{}' from the beginning of the input, as it appears headers were still present", input.substring(0, (endOfHeaderMarker + "\n\n".length())));
 			return result;
 		}
 		return input;

diff --git a/src/main/java/net/sagebits/weatherlink/gui/WeatherLinkLiveGUI.java b/src/main/java/net/sagebits/weatherlink/gui/WeatherLinkLiveGUI.java
@@ -21,7 +21,7 @@ public class WeatherLinkLiveGUI extends Application
 	private WeatherLinkLiveGUIController wllc_;
 
 	public static Logger logger = LogManager.getLogger(WeatherLinkLiveGUI.class);
-	public static final String version = "1.11";
+	public static final String version = "1.12";
 
 	@Override
 	public void start(Stage primaryStage) throws Exception