Bugfix - handling invalid channel

andrasU · Feb 5, 2023 · 409d61f · 409d61f
1 parent 7457a58
commit 409d61f
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 19 deletions.
diff --git a/...java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDeviceChannel.java b/...java/org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDeviceChannel.java
@@ -51,8 +51,12 @@ public boolean createChannelFromJson(String deviceLabel, String channelId, JsonO
 
  channelFunctionID = channelObject.get("functionID").getAsString();
 
- if (isScene) {
- channelFunctionID = channelFunctionID.substring(0, channelFunctionID.length() - 1) + "0";
+ // check whether this is a valid channel
+ if (channelFunctionID.isEmpty()) {
+ // invalid channel found
+ logger.info("Invalid channel fucntion ID found - Devicelabel: {} Channel: {}", deviceLabel, channelId);
+
+ return false;
  }
 
  if (!channelFunctionID.isEmpty()) {
@@ -63,7 +67,12 @@ public boolean createChannelFromJson(String deviceLabel, String channelId, JsonO
  }
  }
 
+ if (isScene) {
+ channelFunctionID = channelFunctionID.substring(0, channelFunctionID.length() - 1) + "0";
+ }
+
  switch (HexUtils.getIntegerFromHex(channelFunctionID)) {
+ case FID_PANEL_SWITCH_SENSOR:
  case FID_SWITCH_SENSOR: {
  this.channelId = channelId;
 
@@ -76,6 +85,7 @@ public boolean createChannelFromJson(String deviceLabel, String channelId, JsonO
 
  break;
  }
+ case FID_PANEL_DIMMING_SENSOR:
  case FID_DIMMING_SENSOR: {
  this.channelId = channelId;
 
@@ -185,6 +195,8 @@ public boolean createChannelFromJson(String deviceLabel, String channelId, JsonO
  case FID_WINDOW_DOOR_SENSOR: {
  this.channelId = channelId;
 
+ logger.info("Window/Door position sensor channel created - Channel FID: {}", channelFunctionID);
+
  FreeAtHomeDatapointGroup newDatapointGroup = new FreeAtHomeDatapointGroup();
  newDatapointGroup.addDatapointToGroup(DATAPOINT_DIRECTION_OUTPUT, 53, channelId, channelObject);
  datapointGroups.add(newDatapointGroup);
@@ -193,8 +205,6 @@ public boolean createChannelFromJson(String deviceLabel, String channelId, JsonO
  newDatapointGroup.addDatapointToGroup(DATAPOINT_DIRECTION_OUTPUT, 41, channelId, channelObject);
  datapointGroups.add(newDatapointGroup);
 
- logger.info("Window/Door position sensor channel created - Channel FID: {}", channelFunctionID);
-
  break;
  }
  case FID_SCENE_TRIGGER: {
@@ -486,7 +496,7 @@ public boolean createChannelFromJson(String deviceLabel, String channelId, JsonO
  default: {
  logger.info("Unknown channel found - Channel FID: {}", channelFunctionID);
 
- break;
+ return false;
  }
  }
 

diff --git a/.../org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDeviceDescription.java b/.../org/openhab/binding/freeathomesystem/internal/datamodel/FreeAtHomeDeviceDescription.java
@@ -113,14 +113,14 @@ public FreeAtHomeDeviceDescription(JsonObject jsonObject, String id) {
  for (String nextChannel : jsonObjectOfChannels.keySet()) {
  FreeAtHomeDeviceChannel newChannel = new FreeAtHomeDeviceChannel();
 
- newChannel.createChannelFromJson(deviceLabel, nextChannel, jsonObjectOfChannels, sceneIsDetected,
- ruleIsDetected);
+ if (newChannel.createChannelFromJson(deviceLabel, nextChannel, jsonObjectOfChannels, sceneIsDetected,
+ ruleIsDetected) == true) {
+ if (interfaceType == DEVICE_INTERFACE_VIRTUAL_TYPE) {
+ newChannel.applyChangesForVirtualDevice();
+ }
 
- if (interfaceType == DEVICE_INTERFACE_VIRTUAL_TYPE) {
- newChannel.applyChangesForVirtualDevice();
+ listOfChannels.add(newChannel);
  }
-
- listOfChannels.add(newChannel);
  }
  }
  }

diff --git a/...n/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeBridgeHandler.java b/...n/java/org/openhab/binding/freeathomesystem/internal/handler/FreeAtHomeBridgeHandler.java
@@ -123,6 +123,7 @@ public void handleCommand(ChannelUID channelUID, Command command) {
  * @author Andras Uhrin
  *
  */
+ @SuppressWarnings("deprecation")
  public @Nullable List<String> getDeviceDeviceList() {
  boolean ret = false;
 

diff --git a/...src/main/java/org/openhab/binding/freeathomesystem/internal/util/PidTranslationUtils.java b/...src/main/java/org/openhab/binding/freeathomesystem/internal/util/PidTranslationUtils.java
@@ -549,55 +549,55 @@ private static PIdContainerClass createFreeAtHomePairingIdTranslation(String p1,
  public static String getShortTextForPairingId(String Key) {
  PIdContainerClass desc = MAP_TRANSLATOR.get(Key);
 
- return desc.label;
+ return (desc != null) ? desc.label : "Unknown label";
  }
 
  @SuppressWarnings("null")
  public static String getDescriptionTextForPairingId(String Key) {
  PIdContainerClass desc = MAP_TRANSLATOR.get(Key);
 
- return desc.descprition;
+ return (desc != null) ? desc.descprition : "Unknown description";
  }
 
  @SuppressWarnings("null")
  public static String getValueTypeForPairingId(String Key) {
  PIdContainerClass desc = MAP_TRANSLATOR.get(Key);
 
- return desc.valueType;
+ return (desc != null) ? desc.valueType : PID_VALUETYPE_DECIMAL;
  }
 
  @SuppressWarnings("null")
  public static String getItemTypeForPairingId(String Key) {
  PIdContainerClass desc = MAP_TRANSLATOR.get(Key);
 
- return desc.category;
+ return (desc != null) ? desc.category : CATEGORY_UNDEFINED;
  }
 
  @SuppressWarnings("null")
  public static String getCategoryForPairingId(String Key) {
  PIdContainerClass desc = MAP_TRANSLATOR.get(Key);
 
- return desc.category;
+ return (desc != null) ? desc.category : CATEGORY_UNDEFINED;
  }
 
  @SuppressWarnings("null")
  public static String getPatternForPairingId(String Key) {
  PIdContainerClass desc = MAP_TRANSLATOR.get(Key);
 
- return desc.category;
+ return (desc != null) ? desc.category : CATEGORY_UNDEFINED;
  }
 
  @SuppressWarnings("null")
  public static int getMax(String Key) {
  PIdContainerClass desc = MAP_TRANSLATOR.get(Key);
 
- return desc.max;
+ return (desc != null) ? desc.max : 1;
  }
 
  @SuppressWarnings("null")
  public static int getMin(String Key) {
  PIdContainerClass desc = MAP_TRANSLATOR.get(Key);
 
- return desc.min;
+ return (desc != null) ? desc.min : 0;
  }
 }