From 0b029f68e3ea50a66a072174a5b725ff41733394 Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Thu, 23 Sep 2021 00:02:05 +0200
Subject: [PATCH] Bugfix for devices that do not have any data yet

---
 .../hal/plugin/assistant/google/trait/DeviceTraitFactory.java | 4 ++--
 .../src/se/hal/plugin/assistant/google/type/DeviceType.java   | 4 ++--
 .../hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeController.java | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/trait/DeviceTraitFactory.java b/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/trait/DeviceTraitFactory.java
index c348c683..9c32b38b 100644
--- a/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/trait/DeviceTraitFactory.java
+++ b/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/trait/DeviceTraitFactory.java
@@ -40,10 +40,10 @@ public class DeviceTraitFactory {
 
 
     public static DeviceTrait[] getTraits(HalAbstractDevice device) {
-        if (device == null || device.getDeviceData() == null)
+        if (device == null || device.getDeviceConfig() == null)
             return new DeviceTrait[0];
 
-        switch (device.getDeviceData().getClass().getName()) {
+        switch (device.getDeviceConfig().getDeviceDataClass().getName()) {
             case "se.hal.struct.devicedata.DimmerEventData":
             case "se.hal.struct.devicedata.OnOffEventData":
                 return new DeviceTrait[]{new OnOffTrait()};
diff --git a/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/type/DeviceType.java b/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/type/DeviceType.java
index 2d9ad4c3..839e6de7 100644
--- a/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/type/DeviceType.java
+++ b/plugins/hal-assistant-google/src/se/hal/plugin/assistant/google/type/DeviceType.java
@@ -148,10 +148,10 @@ public enum DeviceType {
 
 
     public static DeviceType getType(HalAbstractDevice device) {
-        if (device == null || device.getDeviceData() == null)
+        if (device == null || device.getDeviceConfig() == null)
             return null;
 
-        switch (device.getDeviceData().getClass().getName()) {
+        switch (device.getDeviceConfig().getDeviceDataClass().getName()) {
             case "se.hal.struct.devicedata.DimmerEventData":
             case "se.hal.struct.devicedata.OnOffEventData":
                 return LIGHT;
diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeController.java b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeController.java
index 6c52d4ee..461022ab 100644
--- a/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeController.java
+++ b/plugins/hal-zigbee/src/se/hal/plugin/zigbee/ZigbeeController.java
@@ -395,8 +395,7 @@ public class ZigbeeController implements HalSensorController,
         logger.info("Starting Zigbee pairing process.");
 
         networkManager.permitJoin(120);
-        permitJoinTimer = new Timer(120_000);
-        permitJoinTimer.start();
+        permitJoinTimer = new Timer(120_000).start();
     }
 
     @Override