Fix options flow handler. Fixes issue #229 (#233)

Author: oyvindwe

custom_components/connectlife/__init__.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import logging
+
 from homeassistant.exceptions import ConfigEntryError
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform, CONF_USERNAME, CONF_PASSWORD
@@ -26,6 +28,8 @@
 
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
+_LOGGER = logging.getLogger(__name__)
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up ConnectLife."""
@@ -37,6 +41,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up ConnectLife from a config entry."""
+    _LOGGER.debug("Setting up ConnectLife")
+    _LOGGER.debug("Options: %s", entry.options)
     hass.data.setdefault(DOMAIN, {})
     test_server_url = (
         entry.options.get(CONF_TEST_SERVER_URL)
@@ -60,13 +66,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     return True
 
-async def update_listener(hass, entry):
+async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Handle options update."""
+    _LOGGER.debug(f"Reloading ConnectLife")
     await hass.config_entries.async_reload(entry.entry_id)
 
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
+    _LOGGER.debug(f"Unloading ConnectLife")
 
     if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
         hass.data[DOMAIN].pop(entry.entry_id)

custom_components/connectlife/config_flow.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import copy
 import logging
 from typing import Any
 
@@ -82,7 +81,7 @@ def async_get_options_flow(
             config_entry: ConfigEntry,
     ) -> OptionsFlow:
         """Get the options flow for this handler."""
-        return OptionsFlowHandler(config_entry)
+        return OptionsFlowHandler()
 
 
 class CannotConnect(HomeAssistantError):
@@ -96,10 +95,6 @@ class InvalidAuth(HomeAssistantError):
 class OptionsFlowHandler(OptionsFlow):
     """Handles options flow for the component."""
 
-    def __init__(self, config_entry: ConfigEntry) -> None:
-        """Initialize the options flow."""
-        self.config_entry = config_entry
-
     async def async_step_init(self, user_input=None):
         return self.async_show_menu(
             step_id="init",
@@ -167,10 +162,9 @@ async def async_step_development(self, user_input: dict[str, Any] | None = None)
                 )
                 return self.async_show_form(step_id="development", data_schema=schema, errors=errors)
 
-            data = copy.deepcopy(self.config_entry.options).update({
-                CONF_DEVELOPMENT_MODE: development_mode,
-                CONF_TEST_SERVER_URL: test_server_url
-            })
+            data = self.config_entry.options.copy()
+            data[CONF_DEVELOPMENT_MODE] = development_mode
+            data[CONF_TEST_SERVER_URL] = test_server_url
             return self.async_create_entry(title="", data=data)
 
         development_mode = self.config_entry.options.get(CONF_DEVELOPMENT_MODE, False)