@capgo/background-geolocation 8.0.7 → 8.0.8

package/android/src/main/java/com/capgo/capacitor_background_geolocation/BackgroundGeolocationService.java

@@ -14,7 +14,9 @@ import android.location.LocationManager;
 import android.media.MediaPlayer;
 import android.os.Binder;
 import android.os.Build;
+import android.os.Handler;
 import android.os.IBinder;
+import android.os.Looper;
 import android.os.PowerManager;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import com.getcapacitor.Logger;
@@ -40,6 +42,11 @@ public class BackgroundGeolocationService extends Service {
     private double[][] route;
     private double distanceThreshold;
     private boolean isOffRoute;
+
+    private Handler watchdogHandler = new Handler(Looper.getMainLooper());
+    private Runnable watchdogRunnable;
+    private Runnable restartRunnable;
+    private float currentDistanceFilter;
     private PowerManager.WakeLock wakeLock;
 
     @Override
@@ -58,6 +65,7 @@ public class BackgroundGeolocationService extends Service {
         }
         releaseMediaPlayer();
         releaseWakeLock();
+        stopWatchdog();
         stopSelf();
         return false;
     }
@@ -70,6 +78,7 @@ public class BackgroundGeolocationService extends Service {
         super.onDestroy();
         releaseMediaPlayer();
         releaseWakeLock();
+        stopWatchdog();
     }
 
     private void releaseMediaPlayer() {
@@ -116,6 +125,46 @@ public class BackgroundGeolocationService extends Service {
         wakeLock = null;
     }
 
+    private void restartLocationUpdates() {
+        Logger.debug("Location watchdog timed out, restarting updates");
+        if (client == null || locationCallback == null) {
+            return;
+        }
+        client.removeUpdates(locationCallback);
+        if (restartRunnable != null) {
+            watchdogHandler.removeCallbacks(restartRunnable);
+        }
+        restartRunnable = () -> {
+            if (client == null || locationCallback == null) {
+                return;
+            }
+            try {
+                client.requestLocationUpdates(LocationManager.GPS_PROVIDER, 1000, currentDistanceFilter, locationCallback);
+            } catch (SecurityException ignore) {
+                // Permission issues are handled in the start() method
+            }
+            startWatchdog();
+        };
+        watchdogHandler.postDelayed(restartRunnable, 10000);
+    }
+
+    private void startWatchdog() {
+        stopWatchdog();
+        if (watchdogRunnable == null) {
+            watchdogRunnable = this::restartLocationUpdates;
+        }
+        watchdogHandler.postDelayed(watchdogRunnable, 60000);
+    }
+
+    private void stopWatchdog() {
+        if (watchdogRunnable != null) {
+            watchdogHandler.removeCallbacks(watchdogRunnable);
+        }
+        if (restartRunnable != null) {
+            watchdogHandler.removeCallbacks(restartRunnable);
+        }
+    }
+
     // Handles requests from the activity.
     public class LocalBinder extends Binder {
 
@@ -124,8 +173,10 @@ public class BackgroundGeolocationService extends Service {
             acquireWakeLock();
             client = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
             callbackId = id;
+            currentDistanceFilter = distanceFilter;
 
             locationCallback = (location) -> {
+                startWatchdog();
                 if (mediaPlayer != null) {
                     double[] point = { location.getLongitude(), location.getLatitude() };
                     var offRoute = distancePointToRoute(point) > distanceThreshold;
@@ -173,6 +224,7 @@ public class BackgroundGeolocationService extends Service {
         }
 
         String stop() {
+            stopWatchdog();
             client.removeUpdates(locationCallback);
             stopForeground(true);
             stopSelf();

package/ios/Sources/CapgoBackgroundGeolocationPlugin/CapgoCapacitorBackgroundGeolocationPlugin.swift

@@ -38,7 +38,7 @@ func formatLocation(_ location: CLLocation) -> PluginCallResultData {
 @objc(BackgroundGeolocation)
 // swiftlint:disable:next type_body_length
 public class BackgroundGeolocation: CAPPlugin, CLLocationManagerDelegate, CAPBridgedPlugin {
-    private let pluginVersion: String = "8.0.7"
+    private let pluginVersion: String = "8.0.8"
     public let identifier = "BackgroundGeolocationPlugin"
     public let jsName = "BackgroundGeolocation"
     public let pluginMethods: [CAPPluginMethod] = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/background-geolocation",
-  "version": "8.0.7",
+  "version": "8.0.8",
   "description": "Receive accurate geolocation updates even while the app is in the background.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",