Fix alarm config flow blank strings

lawtancool · Jan 16, 2022 · b02a42f · b02a42f
1 parent 3a1cfe4
commit b02a42f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/custom_components/control4/alarm_control_panel.py b/custom_components/control4/alarm_control_panel.py
@@ -340,15 +340,15 @@ def code_format(self):
     def supported_features(self) -> int:
         """Flag supported features."""
         flags = 0
-        if self.entry_data[CONF_ALARM_AWAY_MODE] is not None:
+        if not self.entry_data[CONF_ALARM_AWAY_MODE] == "":
             flags |= SUPPORT_ALARM_ARM_AWAY
-        if self.entry_data[CONF_ALARM_HOME_MODE] is not None:
+        if not self.entry_data[CONF_ALARM_HOME_MODE] == "":
             flags |= SUPPORT_ALARM_ARM_HOME
-        if self.entry_data[CONF_ALARM_NIGHT_MODE] is not None:
+        if not self.entry_data[CONF_ALARM_NIGHT_MODE] == "":
             flags |= SUPPORT_ALARM_ARM_NIGHT
-        if self.entry_data[CONF_ALARM_CUSTOM_BYPASS_MODE] is not None:
+        if not self.entry_data[CONF_ALARM_CUSTOM_BYPASS_MODE] == "":
             flags |= SUPPORT_ALARM_ARM_CUSTOM_BYPASS
-        if self.entry_data[CONF_ALARM_VACATION_MODE] is not None:
+        if not self.entry_data[CONF_ALARM_VACATION_MODE] == "":
             flags |= SUPPORT_ALARM_ARM_VACATION
         return flags
 
@@ -360,7 +360,10 @@ def state(self):
             return STATE_ALARM_ARMING
         if partition_state == CONTROL4_ENTRY_DELAY_STATE:
             return STATE_ALARM_PENDING
-        if (partition_state == CONTROL4_DISARMED_NOT_READY_STATE or partition_state == CONTROL4_DISARMED_READY_STATE):
+        if (
+            partition_state == CONTROL4_DISARMED_NOT_READY_STATE
+            or partition_state == CONTROL4_DISARMED_READY_STATE
+        ):
             return STATE_ALARM_DISARMED
         if partition_state == CONTROL4_ARMED_STATE:
             armed_type = self.extra_state_attributes[CONTROL4_ARMED_TYPE_VAR]

diff --git a/custom_components/control4/const.py b/custom_components/control4/const.py
@@ -3,15 +3,15 @@
 DOMAIN = "control4"
 
 CONF_ALARM_HOME_MODE = "alarm_home_mode"
-DEFAULT_ALARM_HOME_MODE = None
+DEFAULT_ALARM_HOME_MODE = ""
 CONF_ALARM_AWAY_MODE = "alarm_away_mode"
-DEFAULT_ALARM_AWAY_MODE = None
+DEFAULT_ALARM_AWAY_MODE = ""
 CONF_ALARM_NIGHT_MODE = "alarm_night_mode"
-DEFAULT_ALARM_NIGHT_MODE = None
+DEFAULT_ALARM_NIGHT_MODE = ""
 CONF_ALARM_CUSTOM_BYPASS_MODE = "alarm_custom_bypass_mode"
-DEFAULT_ALARM_CUSTOM_BYPASS_MODE = None
+DEFAULT_ALARM_CUSTOM_BYPASS_MODE = ""
 CONF_ALARM_VACATION_MODE = "alarm_vacation_mode"
-DEFAULT_ALARM_VACATION_MODE = None
+DEFAULT_ALARM_VACATION_MODE = ""
 
 CONF_ACCOUNT = "account"
 CONF_DIRECTOR = "director"