@azatek/background-geolocation 1.0.0 → 7.0.0

package/android/src/main/java/com/equimaps/capacitor_background_geolocation/BackgroundGeolocation.java

@@ -42,7 +42,8 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
                 @Permission(
                         strings = {
                                 Manifest.permission.ACCESS_COARSE_LOCATION,
-                                Manifest.permission.ACCESS_FINE_LOCATION
+                                Manifest.permission.ACCESS_FINE_LOCATION,
+                                Manifest.permission.FOREGROUND_SERVICE_LOCATION
                         },
                         alias = "location"
                 )
@@ -70,23 +71,12 @@ public class BackgroundGeolocation extends Plugin {
         } catch (SecurityException ignore) {}
     }
 
-    @PluginMethod(returnType = PluginMethod.RETURN_CALLBACK)
-    public void addWatcher(final PluginCall call) {
-        if (service == null) {
-            call.reject("Service not running.");
+    private void startWatcher(PluginCall call) {
+        if (!isLocationEnabled(getContext())) {
+            call.reject("Location services disabled.", "NOT_AUTHORIZED");
             return;
         }
-        call.setKeepAlive(true);
 
-        if (getPermissionState("location") != PermissionState.GRANTED) {
-            if (call.getBoolean("requestPermissions", true)) {
-                requestPermissionForAlias("location", call, "locationPermissionsCallback");
-            } else {
-                call.reject("Permission denied.", "NOT_AUTHORIZED");
-            }
-        } else if (!isLocationEnabled(getContext())) {
-            call.reject("Location services disabled.", "NOT_AUTHORIZED");
-        }
         if (call.getBoolean("stale", false)) {
             fetchLastLocation(call);
         }
@@ -164,6 +154,26 @@ public class BackgroundGeolocation extends Plugin {
 		);
     }
 
+    @PluginMethod(returnType = PluginMethod.RETURN_CALLBACK)
+    public void addWatcher(final PluginCall call) {
+        if (service == null) {
+            call.reject("Service not running.");
+            return;
+        }
+        call.setKeepAlive(true);
+
+        if (getPermissionState("location") != PermissionState.GRANTED) {
+            if (call.getBoolean("requestPermissions", true)) {
+                requestPermissionForAlias("location", call, "locationPermissionsCallback");
+            } else {
+                call.reject("Permission denied.", "NOT_AUTHORIZED");
+            }
+            return;
+        }
+
+        startWatcher(call);
+    }
+
     @PermissionCallback
     private void locationPermissionsCallback(PluginCall call) {
 
@@ -171,15 +181,13 @@ public class BackgroundGeolocation extends Plugin {
             call.reject("User denied location permission", "NOT_AUTHORIZED");
             return;
         }
-        if (call.getBoolean("stale", false)) {
-            fetchLastLocation(call);
-        }
+
         if (service != null) {
             service.onPermissionsGranted();
-            // The handleOnResume method will now be called, and we don't need it to call
-            // service.onPermissionsGranted again so we reset this flag.
             stoppedWithoutPermissions = false;
         }
+
+        startWatcher(call);
     }
 
     @PluginMethod()

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

@@ -16,6 +16,7 @@ import com.google.android.gms.location.LocationCallback;
 import com.google.android.gms.location.LocationRequest;
 import com.google.android.gms.location.LocationResult;
 import com.google.android.gms.location.LocationServices;
+import com.google.android.gms.location.Priority;
 
 import java.util.HashSet;
 
@@ -118,7 +119,11 @@ public class BackgroundGeolocationService extends Service {
             LocationCallback callback = new LocationCallback(){
                 @Override
                 public void onLocationResult(LocationResult locationResult) {
+                    Logger.debug("onLocationResult called");
                     Location location = locationResult.getLastLocation();
+                    if (location != null) {
+                        Logger.debug("Location received: " + location.getLatitude() + ", " + location.getLongitude());
+                    }
                     Intent intent = new Intent(ACTION_BROADCAST);
                     intent.putExtra("location", location);
                     intent.putExtra("id", id);
@@ -128,6 +133,7 @@ public class BackgroundGeolocationService extends Service {
                 }
                 @Override
                 public void onLocationAvailability(LocationAvailability availability) {
+                    Logger.debug("Location availability: " + availability.isLocationAvailable());
                     if (!availability.isLocationAvailable()) {
                         Logger.debug("Location not available");
                     }
@@ -146,12 +152,16 @@ public class BackgroundGeolocationService extends Service {
             // permissions are not yet granted. Rather than check the permissions, which is fiddly,
             // we simply ignore the exception.
             try {
+                Logger.debug("Requesting location updates with priority: " + priority + ", interval: " + interval);
                 watcher.client.requestLocationUpdates(
                         watcher.locationRequest,
                         watcher.locationCallback,
                         null
                 );
-            } catch (SecurityException ignore) {}
+                Logger.debug("Location updates requested successfully");
+            } catch (SecurityException e) {
+                Logger.error("SecurityException when requesting location updates", e);
+            }
 
             // Promote the service to the foreground if necessary.
             // Ideally we would only call 'startForeground' if the service is not already

package/index.js

@@ -0,0 +1,6 @@
+export const LocationAccuracy = {
+    HIGH: 100,
+    BALANCED: 102,
+    LOW: 104,
+    PASSIVE: 105
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azatek/background-geolocation",
-    "version": "1.0.0",
+    "version": "7.0.0",
     "description": "Capacitor plugin for background geolocation tracking with configurable GPS accuracy modes (HIGH/BALANCED/LOW/PASSIVE) for battery optimization. Fork of @capacitor-community/background-geolocation with enhanced accuracy control.",
     "keywords": [
         "capacitor",
@@ -21,8 +21,18 @@
     },
     "author": "AzaTek",
     "license": "MIT",
+    "main": "index.js",
+    "module": "index.js",
     "types": "definitions.d.ts",
+    "exports": {
+        ".": {
+            "types": "./definitions.d.ts",
+            "import": "./index.js",
+            "require": "./index.js"
+        }
+    },
     "files": [
+        "index.js",
         "CapacitorCommunityBackgroundGeolocation.podspec",
         "Package.swift",
         "android/build.gradle",