@capacitor/geolocation 8.2.1-next.1 → 8.2.2

package/README.md

@@ -25,7 +25,7 @@ location in the background. As a result, Apple requires you to include a
 prompt won’t appear to users, you can safely use the same description string as for
 `NSLocationWhenInUseUsageDescription`.
 
-:::info
+:::
 
 Read about [Configuring `Info.plist`](https://capacitorjs.com/docs/ios/configuration#configuring-infoplist) in the [iOS Guide](https://capacitorjs.com/docs/ios) for more information on setting iOS permissions in Xcode
 
@@ -46,7 +46,7 @@ The first two permissions ask for location data, both fine and coarse, and the l
 
 If you only require approximate location (variable accuracy but usually around 2 kilometers), you may just declare `ACCESS_COARSE_LOCATION` and `<uses-feature`, and use `enableHighAccuracy=false` when requesting location
 
-:::note
+:::
 
 Read about [Setting Permissions](https://capacitorjs.com/docs/android/configuration#setting-permissions) in the [Android Guide](https://capacitorjs.com/docs/android) for more information on setting Android permissions.
 

package/android/build.gradle

@@ -27,7 +27,9 @@ buildscript {
 }
 
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
+if (project.extensions.findByName('kotlin') == null) {
+    apply plugin: 'kotlin-android'
+}
 if (System.getenv("CAP_PLUGIN_PUBLISH") == "true") {
     apply plugin: 'io.github.gradle-nexus.publish-plugin'
     apply from: file('../scripts/android/publish-root.gradle')
@@ -81,7 +83,7 @@ dependencies {
         implementation project(':capacitor-android')
     }
 
-    implementation("io.ionic.libs:iongeolocation-android:2.2.1")
+    implementation("io.ionic.libs:iongeolocation-android:2.2.2")
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
 
     implementation 'com.google.code.gson:gson:2.13.2'

package/ios/Sources/GeolocationPlugin/GeolocationPlugin.swift

@@ -130,7 +130,8 @@ private extension GeolocationPlugin {
 
                 switch status {
                 case .denied:
-                    self.onLocationPermissionNotGranted(error: .permissionDenied)
+                    let error: GeolocationError = self.locationService?.areLocationServicesEnabled() == false ? .locationServicesDisabled : .permissionDenied
+                    self.onLocationPermissionNotGranted(error: error)
                 case .notDetermined:
                     self.requestLocationAuthorisation(type: .whenInUse)
                 case .restricted:
@@ -149,6 +150,9 @@ private extension GeolocationPlugin {
         locationCancellable = locationService?.currentLocationPublisher
             .catch { [weak self] error -> AnyPublisher<IONGLOCPositionModel, Never> in
                 print("An error was found while retrieving the location: \(error)")
+                // A failure terminates this subscription; re-bind or later callbacks are dropped. RMET-5383
+                self?.locationInitialized = false
+                self?.bindLocationPublisher()
 
                 if case IONGLOCLocationError.locationUnavailable = error {
                     print("Location unavailable (likely due to backgrounding). Keeping watch callbacks alive.")
@@ -233,7 +237,12 @@ private extension GeolocationPlugin {
 
         switch locationService?.authorisationStatus {
         case .authorisedAlways, .authorisedWhenInUse: onLocationPermissionGranted()
-        case .denied: callbackManager?.sendError(.permissionDenied)
+        case .denied:
+            if locationService?.areLocationServicesEnabled() == false {
+                callbackManager?.sendError(.locationServicesDisabled)
+            } else {
+                callbackManager?.sendError(.permissionDenied)
+            }
         case .restricted: callbackManager?.sendError(.permissionRestricted)
         default: break
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capacitor/geolocation",
-  "version": "8.2.1-next.1",
+  "version": "8.2.2",
   "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",