@capacitor/geolocation 7.1.1 → 7.1.3

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Ionic
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
             targets: ["GeolocationPlugin"])
     ],
     dependencies: [
-        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", branch: "main")
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "7.0.0")
     ],
     targets: [
         .binaryTarget(

package/android/src/main/kotlin/com/capacitorjs/plugins/geolocation/GeolocationPlugin.kt

@@ -326,13 +326,16 @@ class GeolocationPlugin : Plugin() {
      * @return IONGLOCLocationOptions object
      */
     private fun createOptions(call: PluginCall): IONGLOCLocationOptions {
-        val timeout = call.getLong("timeout", 10000) ?: 10000
-        val maximumAge = call.getLong("maximumAge", 0) ?: 0
+        val timeout = call.getNumber("timeout", 10000)
+        val maximumAge = call.getNumber("maximumAge", 0)
         val enableHighAccuracy = call.getBoolean("enableHighAccuracy", false) ?: false
-        val minimumUpdateInterval = call.getLong("minimumUpdateInterval", 5000) ?: 5000
+        val minimumUpdateInterval = call.getNumber("minimumUpdateInterval", 5000)
 
         val locationOptions = IONGLOCLocationOptions(timeout, maximumAge, enableHighAccuracy, minimumUpdateInterval)
 
         return locationOptions
     }
+
+    private fun PluginCall.getNumber(name: String, defaultValue: Long): Long =
+        getLong(name) ?: getInt(name)?.toLong() ?: defaultValue
 }

package/ios/Sources/GeolocationPlugin/GeolocationPlugin.swift

@@ -1,5 +1,6 @@
 import Capacitor
 import IONGeolocationLib
+import UIKit
 
 import Combine
 
@@ -17,12 +18,38 @@ public class GeolocationPlugin: CAPPlugin, CAPBridgedPlugin {
 
     private var locationService: (any IONGLOCService)?
     private var cancellables = Set<AnyCancellable>()
+    private var locationCancellable: AnyCancellable?
     private var callbackManager: GeolocationCallbackManager?
-    private var isInitialised: Bool = false
+    private var statusInitialized = false
+    private var locationInitialized: Bool = false
 
     override public func load() {
         self.locationService = IONGLOCManagerWrapper()
         self.callbackManager = .init(capacitorBridge: bridge)
+        
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(appDidBecomeActive),
+            name: UIApplication.didBecomeActiveNotification,
+            object: nil
+        )
+    }
+
+    @objc private func appDidBecomeActive() {
+        if let watchCallbacksEmpty = callbackManager?.watchCallbacks.isEmpty, !watchCallbacksEmpty {
+            print("App became active. Restarting location monitoring for watch callbacks.")
+            locationCancellable?.cancel()
+            locationCancellable = nil
+            locationInitialized = false
+            
+            locationService?.stopMonitoringLocation()
+            locationService?.startMonitoringLocation()
+            bindLocationPublisher()
+        }
+    }
+
+    deinit {
+        NotificationCenter.default.removeObserver(self)
     }
 
     @objc func getCurrentPosition(_ call: CAPPluginCall) {
@@ -48,6 +75,9 @@ public class GeolocationPlugin: CAPPlugin, CAPBridgedPlugin {
 
         if (callbackManager?.watchCallbacks.isEmpty) ?? false {
             locationService?.stopMonitoringLocation()
+            locationCancellable?.cancel()
+            locationCancellable = nil
+            locationInitialized = false
         }
 
         callbackManager?.sendSuccess(call)
@@ -83,12 +113,13 @@ public class GeolocationPlugin: CAPPlugin, CAPBridgedPlugin {
 
 private extension GeolocationPlugin {
     func shouldSetupBindings() {
-        guard !isInitialised else { return }
-        isInitialised = true
-        setupBindings()
+        bindAuthorisationStatusPublisher()
+        bindLocationPublisher()
     }
 
-    func setupBindings() {
+    func bindAuthorisationStatusPublisher() {
+        guard !statusInitialized else { return }
+        statusInitialized = true
         locationService?.authorisationStatusPublisher
             .sink(receiveValue: { [weak self] status in
                 guard let self else { return }
@@ -106,17 +137,29 @@ private extension GeolocationPlugin {
                 }
             })
             .store(in: &cancellables)
+    }
 
-        locationService?.currentLocationPublisher
-            .sink(receiveCompletion: { [weak self] completion in
-                if case .failure(let error) = completion {
-                    print("An error was found while retrieving the location: \(error)")
+    func bindLocationPublisher() {
+        guard !locationInitialized else { return }
+        locationInitialized = true
+        locationCancellable = locationService?.currentLocationPublisher
+            .catch { [weak self] error -> AnyPublisher<IONGLOCPositionModel, Never> in
+                print("An error was found while retrieving the location: \(error)")
+                
+                if case IONGLOCLocationError.locationUnavailable = error {
+                    print("Location unavailable (likely due to backgrounding). Keeping watch callbacks alive.")
+                    self?.callbackManager?.sendError(.positionUnavailable)
+                    return Empty<IONGLOCPositionModel, Never>()
+                        .eraseToAnyPublisher()
+                } else {
                     self?.callbackManager?.sendError(.positionUnavailable)
+                    return Empty<IONGLOCPositionModel, Never>()
+                        .eraseToAnyPublisher()
                 }
-            }, receiveValue: { [weak self] position in
+            }
+            .sink(receiveValue: { [weak self] position in
                 self?.callbackManager?.sendSuccess(with: position)
             })
-            .store(in: &cancellables)
     }
 
     func requestLocationAuthorisation(type requestType: IONGLOCAuthorisationRequestType) {
@@ -128,10 +171,10 @@ private extension GeolocationPlugin {
 
     func checkIfLocationServicesAreEnabled(_ call: CAPPluginCall? = nil) -> Bool {
         guard locationService?.areLocationServicesEnabled() == true else {
-                call.map { callbackManager?.sendError($0, error: .locationServicesDisabled) }
-                    ?? callbackManager?.sendError(.locationServicesDisabled)
-                return false
-            }
+            call.map { callbackManager?.sendError($0, error: .locationServicesDisabled) }
+                ?? callbackManager?.sendError(.locationServicesDisabled)
+            return false
+        }
         return true
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/geolocation",
-  "version": "7.1.1",
+  "version": "7.1.3",
   "description": "The Geolocation API provides simple methods for getting and tracking the current position of the device using GPS, along with altitude, heading, and speed information if available.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -46,7 +46,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@capacitor/synapse": "^1.0.1"
+    "@capacitor/synapse": "^1.0.3"
   },
   "devDependencies": {
     "@capacitor/android": "next",