Cleanup Config-Variable gps_accuracy_threshold

homeassistant/components/icloud/__init__.py

@@ -11,10 +11,8 @@
 
 from .account import IcloudAccount
 from .const import (
-    CONF_GPS_ACCURACY_THRESHOLD,
     CONF_MAX_INTERVAL,
     CONF_WITH_FAMILY,
-    DEFAULT_GPS_ACCURACY_THRESHOLD,
     DEFAULT_MAX_INTERVAL,
     DEFAULT_WITH_FAMILY,
     DOMAIN,
@@ -74,9 +72,6 @@
         vol.Required(CONF_PASSWORD): cv.string,
         vol.Optional(CONF_WITH_FAMILY, default=DEFAULT_WITH_FAMILY): cv.boolean,
         vol.Optional(CONF_MAX_INTERVAL, default=DEFAULT_MAX_INTERVAL): cv.positive_int,
-        vol.Optional(
-            CONF_GPS_ACCURACY_THRESHOLD, default=DEFAULT_GPS_ACCURACY_THRESHOLD
-        ): cv.positive_int,
     }
 )
 
@@ -112,7 +107,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     password = entry.data[CONF_PASSWORD]
     with_family = entry.data[CONF_WITH_FAMILY]
     max_interval = entry.data[CONF_MAX_INTERVAL]
-    gps_accuracy_threshold = entry.data[CONF_GPS_ACCURACY_THRESHOLD]
 
     # For backwards compat
     if entry.unique_id is None:
@@ -127,7 +121,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         icloud_dir,
         with_family,
         max_interval,
-        gps_accuracy_threshold,
         entry,
     )
     await hass.async_add_executor_job(account.setup)

homeassistant/components/icloud/account.py

@@ -83,7 +83,6 @@ def __init__(
         icloud_dir: Store,
         with_family: bool,
         max_interval: int,
-        gps_accuracy_threshold: int,
         config_entry: ConfigEntry,
     ) -> None:
         """Initialize an iCloud account."""
@@ -93,7 +92,6 @@ def __init__(
         self._with_family = with_family
         self._fetch_interval = max_interval
         self._max_interval = max_interval
-        self._gps_accuracy_threshold = gps_accuracy_threshold
 
         self._icloud_dir = icloud_dir
 

homeassistant/components/icloud/config_flow.py

@@ -15,10 +15,8 @@
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 
 from .const import (
-    CONF_GPS_ACCURACY_THRESHOLD,
     CONF_MAX_INTERVAL,
     CONF_WITH_FAMILY,
-    DEFAULT_GPS_ACCURACY_THRESHOLD,
     DEFAULT_MAX_INTERVAL,
     DEFAULT_WITH_FAMILY,
     DOMAIN,
@@ -44,7 +42,6 @@ def __init__(self):
         self._password = None
         self._with_family = None
         self._max_interval = None
-        self._gps_accuracy_threshold = None
 
         self._trusted_device = None
         self._verification_code = None
@@ -99,9 +96,6 @@ async def _validate_and_create_entry(self, user_input, step_id):
         self._username = extra_inputs[CONF_USERNAME]
         self._with_family = extra_inputs.get(CONF_WITH_FAMILY, DEFAULT_WITH_FAMILY)
         self._max_interval = extra_inputs.get(CONF_MAX_INTERVAL, DEFAULT_MAX_INTERVAL)
-        self._gps_accuracy_threshold = extra_inputs.get(
-            CONF_GPS_ACCURACY_THRESHOLD, DEFAULT_GPS_ACCURACY_THRESHOLD
-        )
 
         # Check if already configured
         if self.unique_id is None:
@@ -146,7 +140,6 @@ async def _validate_and_create_entry(self, user_input, step_id):
             CONF_PASSWORD: self._password,
             CONF_WITH_FAMILY: self._with_family,
             CONF_MAX_INTERVAL: self._max_interval,
-            CONF_GPS_ACCURACY_THRESHOLD: self._gps_accuracy_threshold,
         }
 
         # If this is a password update attempt, update the entry instead of creating one
@@ -302,7 +295,6 @@ async def async_step_verification_code(self, user_input=None, errors=None):
                 CONF_PASSWORD: self._password,
                 CONF_WITH_FAMILY: self._with_family,
                 CONF_MAX_INTERVAL: self._max_interval,
-                CONF_GPS_ACCURACY_THRESHOLD: self._gps_accuracy_threshold,
             }
         )
 

homeassistant/components/icloud/const.py

@@ -4,11 +4,9 @@
 
 CONF_WITH_FAMILY = "with_family"
 CONF_MAX_INTERVAL = "max_interval"
-CONF_GPS_ACCURACY_THRESHOLD = "gps_accuracy_threshold"
 
 DEFAULT_WITH_FAMILY = False
 DEFAULT_MAX_INTERVAL = 30  # min
-DEFAULT_GPS_ACCURACY_THRESHOLD = 500  # meters
 
 # to store the cookie
 STORAGE_KEY = DOMAIN

tests/components/icloud/test_config_flow.py

@@ -10,10 +10,8 @@
     CONF_VERIFICATION_CODE,
 )
 from homeassistant.components.icloud.const import (
-    CONF_GPS_ACCURACY_THRESHOLD,
     CONF_MAX_INTERVAL,
     CONF_WITH_FAMILY,
-    DEFAULT_GPS_ACCURACY_THRESHOLD,
     DEFAULT_MAX_INTERVAL,
     DEFAULT_WITH_FAMILY,
     DOMAIN,
@@ -30,14 +28,12 @@
 PASSWORD_2 = "second_password"
 WITH_FAMILY = True
 MAX_INTERVAL = 15
-GPS_ACCURACY_THRESHOLD = 250
 
 MOCK_CONFIG = {
     CONF_USERNAME: USERNAME,
     CONF_PASSWORD: PASSWORD,
     CONF_WITH_FAMILY: DEFAULT_WITH_FAMILY,
     CONF_MAX_INTERVAL: DEFAULT_MAX_INTERVAL,
-    CONF_GPS_ACCURACY_THRESHOLD: DEFAULT_GPS_ACCURACY_THRESHOLD,
 }
 
 TRUSTED_DEVICES = [
@@ -194,7 +190,6 @@ async def test_user_with_cookie(hass: HomeAssistant, service_authenticated: Magi
     assert result["data"][CONF_PASSWORD] == PASSWORD
     assert result["data"][CONF_WITH_FAMILY] == WITH_FAMILY
     assert result["data"][CONF_MAX_INTERVAL] == DEFAULT_MAX_INTERVAL
-    assert result["data"][CONF_GPS_ACCURACY_THRESHOLD] == DEFAULT_GPS_ACCURACY_THRESHOLD
 
 
 async def test_import(hass: HomeAssistant, service: MagicMock):
@@ -217,7 +212,6 @@ async def test_import(hass: HomeAssistant, service: MagicMock):
             CONF_PASSWORD: PASSWORD,
             CONF_WITH_FAMILY: WITH_FAMILY,
             CONF_MAX_INTERVAL: MAX_INTERVAL,
-            CONF_GPS_ACCURACY_THRESHOLD: GPS_ACCURACY_THRESHOLD,
         },
     )
     assert result["type"] == data_entry_flow.RESULT_TYPE_FORM
@@ -241,7 +235,6 @@ async def test_import_with_cookie(
     assert result["data"][CONF_PASSWORD] == PASSWORD
     assert result["data"][CONF_WITH_FAMILY] == DEFAULT_WITH_FAMILY
     assert result["data"][CONF_MAX_INTERVAL] == DEFAULT_MAX_INTERVAL
-    assert result["data"][CONF_GPS_ACCURACY_THRESHOLD] == DEFAULT_GPS_ACCURACY_THRESHOLD
 
     # import with all
     result = await hass.config_entries.flow.async_init(
@@ -252,7 +245,6 @@ async def test_import_with_cookie(
             CONF_PASSWORD: PASSWORD,
             CONF_WITH_FAMILY: WITH_FAMILY,
             CONF_MAX_INTERVAL: MAX_INTERVAL,
-            CONF_GPS_ACCURACY_THRESHOLD: GPS_ACCURACY_THRESHOLD,
         },
     )
     assert result["type"] == data_entry_flow.RESULT_TYPE_CREATE_ENTRY
@@ -262,7 +254,6 @@ async def test_import_with_cookie(
     assert result["data"][CONF_PASSWORD] == PASSWORD
     assert result["data"][CONF_WITH_FAMILY] == WITH_FAMILY
     assert result["data"][CONF_MAX_INTERVAL] == MAX_INTERVAL
-    assert result["data"][CONF_GPS_ACCURACY_THRESHOLD] == GPS_ACCURACY_THRESHOLD
 
 
 async def test_two_accounts_setup(
@@ -288,7 +279,6 @@ async def test_two_accounts_setup(
     assert result["data"][CONF_PASSWORD] == PASSWORD
     assert result["data"][CONF_WITH_FAMILY] == DEFAULT_WITH_FAMILY
     assert result["data"][CONF_MAX_INTERVAL] == DEFAULT_MAX_INTERVAL
-    assert result["data"][CONF_GPS_ACCURACY_THRESHOLD] == DEFAULT_GPS_ACCURACY_THRESHOLD
 
 
 async def test_already_setup(hass: HomeAssistant):
@@ -430,7 +420,6 @@ async def test_verification_code_success(hass: HomeAssistant, service: MagicMock
     assert result["data"][CONF_PASSWORD] == PASSWORD
     assert result["data"][CONF_WITH_FAMILY] == DEFAULT_WITH_FAMILY
     assert result["data"][CONF_MAX_INTERVAL] == DEFAULT_MAX_INTERVAL
-    assert result["data"][CONF_GPS_ACCURACY_THRESHOLD] == DEFAULT_GPS_ACCURACY_THRESHOLD
 
 
 async def test_validate_verification_code_failed(
@@ -475,7 +464,6 @@ async def test_2fa_code_success(hass: HomeAssistant, service_2fa: MagicMock):
     assert result["data"][CONF_PASSWORD] == PASSWORD
     assert result["data"][CONF_WITH_FAMILY] == DEFAULT_WITH_FAMILY
     assert result["data"][CONF_MAX_INTERVAL] == DEFAULT_MAX_INTERVAL
-    assert result["data"][CONF_GPS_ACCURACY_THRESHOLD] == DEFAULT_GPS_ACCURACY_THRESHOLD
 
 
 async def test_validate_2fa_code_failed(