From 5dba447d7a624a31e61fc48245ea71305b6bf4c9 Mon Sep 17 00:00:00 2001
From: Dor-bl <59066376+Dor-bl@users.noreply.github.com>
Date: Sun, 3 May 2026 20:31:32 +0000
Subject: [PATCH] refactor: remove legacy fallback in toggle_location_services

Removed the deprecated fallback logic in `toggle_location_services` that
used the `TOGGLE_LOCATION_SERVICES` command. The method now exclusively
uses the `mobile: toggleGps` script.

Also removed the `TOGGLE_LOCATION_SERVICES` constant from
`MobileCommand` and its registration in `Location._add_commands`, as it
is no longer used.

Updated `test/unit/webdriver/device/location_test.py` to verify the new
behavior.
---
 appium/webdriver/extensions/location.py     | 12 +-----------
 appium/webdriver/mobilecommand.py           |  1 -
 test/unit/webdriver/device/location_test.py |  4 +++-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/appium/webdriver/extensions/location.py b/appium/webdriver/extensions/location.py
index 3141050ae..fc1fcae28 100644
--- a/appium/webdriver/extensions/location.py
+++ b/appium/webdriver/extensions/location.py
@@ -14,7 +14,6 @@
 
 from typing import Dict, Union
 
-from selenium.common.exceptions import UnknownMethodException
 from typing_extensions import Self
 
 from appium.protocols.webdriver.can_execute_commands import CanExecuteCommands
@@ -33,11 +32,7 @@ def toggle_location_services(self) -> Self:
         Returns:
             Union['WebDriver', 'Location']: Self instance
         """
-        try:
-            self.execute_script('mobile: toggleGps')
-        except UnknownMethodException:
-            # TODO: Remove the fallback
-            self.execute(Command.TOGGLE_LOCATION_SERVICES)
+        self.execute_script('mobile: toggleGps')
         return self
 
     def set_location(
@@ -89,10 +84,5 @@ def location(self) -> Dict[str, float]:
 
     def _add_commands(self) -> None:
         """Add location endpoints. They are not int w3c spec."""
-        self.command_executor.add_command(
-            Command.TOGGLE_LOCATION_SERVICES,
-            'POST',
-            '/session/$sessionId/appium/device/toggle_location_services',
-        )
         self.command_executor.add_command(Command.GET_LOCATION, 'GET', '/session/$sessionId/location')
         self.command_executor.add_command(Command.SET_LOCATION, 'POST', '/session/$sessionId/location')
diff --git a/appium/webdriver/mobilecommand.py b/appium/webdriver/mobilecommand.py
index 79ac25e1b..67f0ce0a7 100644
--- a/appium/webdriver/mobilecommand.py
+++ b/appium/webdriver/mobilecommand.py
@@ -84,7 +84,6 @@ class MobileCommand:
     GET_SYSTEM_BARS = 'getSystemBars'
     GET_DISPLAY_DENSITY = 'getDisplayDensity'
     TOGGLE_WIFI = 'toggleWiFi'
-    TOGGLE_LOCATION_SERVICES = 'toggleLocationServices'
     GET_PERFORMANCE_DATA_TYPES = 'getPerformanceDataTypes'
     GET_PERFORMANCE_DATA = 'getPerformanceData'
     GET_NETWORK_CONNECTION = 'getNetworkConnection'
diff --git a/test/unit/webdriver/device/location_test.py b/test/unit/webdriver/device/location_test.py
index fb0112bc5..f09820b34 100644
--- a/test/unit/webdriver/device/location_test.py
+++ b/test/unit/webdriver/device/location_test.py
@@ -24,10 +24,12 @@ class TestWebDriverLocation(object):
     @httpretty.activate
     def test_toggle_location_services(self):
         driver = android_w3c_driver()
-        httpretty.register_uri(httpretty.POST, appium_command('/session/1234567890/appium/device/toggle_location_services'))
         httpretty.register_uri(httpretty.POST, appium_command('/session/1234567890/execute/sync'))
         assert isinstance(driver.toggle_location_services(), WebDriver)
 
+        d = get_httpretty_request_body(httpretty.last_request())
+        assert d['script'] == 'mobile: toggleGps'
+
     @httpretty.activate
     def test_set_location_float(self):
         driver = android_w3c_driver()