Merge pull request #2302 from leancodepl/noThrowOnSelectFineLocation

No throw error on select already selected location
leancodepl · Aug 27, 2024 · 9db9449 · 9db9449
2 parents bbbc126 + fe36e33
commit 9db9449
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/packages/patrol/CHANGELOG.md b/packages/patrol/CHANGELOG.md
@@ -1,5 +1,6 @@
-## 3.11.0
+## Unreleased
 
+- No throw error in `selectFineLocation` when it's already selected. (#2302)
 - Add Option to select tap Location in enterText and enterTextByIndex (#2312)
 
 ## 3.10.0

diff --git a/packages/patrol/darwin/Classes/AutomatorServer/Automator/IOSAutomator.swift b/packages/patrol/darwin/Classes/AutomatorServer/Automator/IOSAutomator.swift
@@ -794,6 +794,11 @@
         return
       }
 
+      if isFineLocationEnabled() {
+        Logger.shared.i("Fine location is already enabled")
+        return
+      }
+
       try runAction("selecting fine location") {
         let alerts = self.springboard.alerts
         let button = alerts.buttons["Precise: Off"]
@@ -807,12 +812,30 @@
       }
     }
 
+    func isFineLocationEnabled() -> Bool {
+      if iOS13orOlder() {
+        Logger.shared.i("Ignored call to isFineLocationEnabled() (iOS < 14)")
+        return false
+      }
+
+      let alerts = self.springboard.alerts
+      let button = alerts.buttons["Precise: On"]
+      let exists = button.waitForExistence(timeout: self.timeout)
+
+      return exists
+    }
+
     func selectCoarseLocation() throws {
       if iOS13orOlder() {
         Logger.shared.i("Ignored call to selectCoarseLocation() (iOS < 14)")
         return
       }
 
+      if !isFineLocationEnabled() {
+        Logger.shared.i("Coarse location is already enabled")
+        return
+      }
+
       try runAction("selecting coarse location") {
         let alerts = self.springboard.alerts
         let button = alerts.buttons["Precise: On"]