Fix NPE when encountering certain ble advertisements

Scrin · Jun 26, 2019 · 55f5fd2 · 55f5fd2
1 parent 555f21a
commit 55f5fd2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+### v0.2.5
+
+ - Improved error tolerance while parsing for raw data
+ - General refactoring with no functional changes
+ - Added "named" filter mode which saves only named tags (thanks matthewgardner)
+
 ### v0.2.4
 
  - Significant amount of refactoring, this release may be a bit more unstable than usual

diff --git a/src/main/java/fi/tkgwf/ruuvi/handler/BeaconHandler.java b/src/main/java/fi/tkgwf/ruuvi/handler/BeaconHandler.java
@@ -28,7 +28,7 @@ public Optional<EnhancedRuuviMeasurement> handle(HCIData hciData) {
         if (adData == null) {
             adData = hciData.findAdvertisementDataByType(0x16); // Eddystone url
             if (adData == null) {
-                return null;
+                return Optional.empty();
             }
         }
         RuuviMeasurement measurement = parser.parse(adData.dataBytes());