From 005eb0ece7f507799cef167c552bf05a45ccf786 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton@traccar.org>
Date: Thu, 15 Jan 2026 07:27:28 -0800
Subject: [PATCH] Upgrade background location lib

---
 android/app/src/main/AndroidManifest.xml |  2 +-
 android/build.gradle.kts                 |  4 --
 lib/preferences.dart                     | 82 ++++++++++++++----------
 pubspec.lock                             | 12 +---
 pubspec.yaml                             |  2 +-
 5 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 4c7c617..37f934c 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -44,7 +44,7 @@
         <!-- flutter_background_geolocation license -->
         <meta-data
             android:name="com.transistorsoft.locationmanager.license"
-            android:value="ddc599599cddaa61dfe5bb25c2b46f549c6d749fae5d0273297b304753e2e5e3" />
+            android:value="eyJhbGciOiJFZERTQSIsImtpZCI6ImVkMjU1MTktbWFpbi12MSJ9.eyJvcyI6ImFuZHJvaWQiLCJhcHBfaWQiOiJvcmcudHJhY2Nhci5jbGllbnQiLCJvcmRlcl9udW1iZXIiOjE0MDgzLCJyZW5ld2FsX3VybCI6Imh0dHBzOi8vc2hvcC50cmFuc2lzdG9yc29mdC5jb20vY2FydC8zMTg3NDM1NjA1MjA3MToxP25vdGU9OTQ2MSIsImN1c3RvbWVyX2lkIjo4NjE1LCJwcm9kdWN0IjoiZmx1dHRlci1iYWNrZ3JvdW5kLWdlb2xvY2F0aW9uIiwia2V5X3ZlcnNpb24iOjEsImFsbG93ZWRfc3VmZml4ZXMiOlsiLmRldiIsIi5kZXZlbG9wbWVudCIsIi5zdGFnaW5nIiwiLnN0YWdlIiwiLnFhIiwiLnVhdCIsIi50ZXN0IiwiLmRlYnVnIl0sIm1heF9idWlsZF9zdGFtcCI6MjAyNjA3MDYsImdyYWNlX2J1aWxkcyI6MCwiZW50aXRsZW1lbnRzIjpbImNvcmUiXSwiaWF0IjoxNzY1NjQyNzI2fQ.ufcC9IUak4MD7lcbB2CXIIaXHzo1xUauHIFcqyC7onBUxFcpcg2LihIk7cJGFsA_FhsHjRfkSzqQFweD1gdiCA" />
     </application>
     <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility and
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
index 8262f57..2b993b6 100644
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@@ -6,10 +6,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        // [required] background_geolocation
-        maven(url = "${project(":flutter_background_geolocation").projectDir}/libs")
-        // [required] background_fetch
-        maven(url = "${project(":background_fetch").projectDir}/libs")
     }
 }
 
diff --git a/lib/preferences.dart b/lib/preferences.dart
index 864424e..fe206ab 100644
--- a/lib/preferences.dart
+++ b/lib/preferences.dart
@@ -79,43 +79,55 @@ class Preferences {
     final heartbeatInterval = instance.getInt(heartbeat) ?? 0;
     return bg.Config(
       isMoving: true,
-      enableHeadless: true,
-      stopOnTerminate: false,
-      startOnBoot: true,
-      desiredAccuracy: switch (instance.getString(accuracy)) {
-        'highest' => Platform.isIOS ? bg.Config.DESIRED_ACCURACY_NAVIGATION : bg.Config.DESIRED_ACCURACY_HIGH,
-        'high' => bg.Config.DESIRED_ACCURACY_HIGH,
-        'low' => bg.Config.DESIRED_ACCURACY_LOW,
-        _ => bg.Config.DESIRED_ACCURACY_MEDIUM,
-      },
-      autoSync: false,
-      url: _formatUrl(instance.getString(url)),
-      params: {
-        'device_id': instance.getString(id),
-      },
-      distanceFilter: isHighestAccuracy ? 0 : instance.getInt(distance)?.toDouble(),
-      locationUpdateInterval: isHighestAccuracy ? 0 : (locationUpdateInterval > 0 ? locationUpdateInterval : null),
-      heartbeatInterval: heartbeatInterval > 0 ? heartbeatInterval : null,
-      maxRecordsToPersist: instance.getBool(buffer) != false ? -1 : 1,
-      logLevel: bg.Config.LOG_LEVEL_VERBOSE,
-      logMaxDays: 1,
-      locationTemplate: _locationTemplate(),
-      preventSuspend: heartbeatInterval > 0,
-      disableElasticity: true,
-      disableStopDetection: instance.getBool(stopDetection) == false,
-      pausesLocationUpdatesAutomatically: Platform.isIOS ? !(isHighestAccuracy || instance.getBool(stopDetection) == false) : null,
-      fastestLocationUpdateInterval: isHighestAccuracy ? 0 : fastestLocationUpdateInterval,
-      backgroundPermissionRationale: bg.PermissionRationale(
-        title: 'Allow {applicationName} to access this device\'s location in the background',
-        message: 'For reliable tracking, please enable {backgroundPermissionOptionLabel} location access.',
-        positiveAction: 'Change to {backgroundPermissionOptionLabel}',
-        negativeAction: 'Cancel'
+      geolocation: bg.GeoConfig(
+        desiredAccuracy: switch (instance.getString(accuracy)) {
+          'highest' => Platform.isIOS ? bg.DesiredAccuracy.navigation : bg.DesiredAccuracy.high,
+          'high' => bg.DesiredAccuracy.high,
+          'low' => bg.DesiredAccuracy.low,
+          _ => bg.DesiredAccuracy.medium,
+        },
+        distanceFilter: isHighestAccuracy ? 0 : instance.getInt(distance)?.toDouble(),
+        locationUpdateInterval: isHighestAccuracy ? 0 : (locationUpdateInterval > 0 ? locationUpdateInterval : null),
+        fastestLocationUpdateInterval: isHighestAccuracy ? 0 : fastestLocationUpdateInterval,
+        disableElasticity: true,
+        pausesLocationUpdatesAutomatically: Platform.isIOS ? !(isHighestAccuracy || instance.getBool(stopDetection) == false) : null,
+        showsBackgroundLocationIndicator: false,
       ),
-      notification: bg.Notification(
-        smallIcon: 'drawable/ic_stat_notify',
-        priority: bg.Config.NOTIFICATION_PRIORITY_LOW,
+      app: bg.AppConfig(
+        enableHeadless: true,
+        stopOnTerminate: false,
+        startOnBoot: true,
+        heartbeatInterval: heartbeatInterval > 0 ? heartbeatInterval.toDouble() : null,
+        preventSuspend: heartbeatInterval > 0,
+        backgroundPermissionRationale: bg.PermissionRationale(
+          title: 'Allow {applicationName} to access this device\'s location in the background',
+          message: 'For reliable tracking, please enable {backgroundPermissionOptionLabel} location access.',
+          positiveAction: 'Change to {backgroundPermissionOptionLabel}',
+          negativeAction: 'Cancel'
+        ),
+        notification: bg.Notification(
+          smallIcon: 'drawable/ic_stat_notify',
+          priority: bg.NotificationPriority.low,
+        ),
+      ),
+      http: bg.HttpConfig(
+        autoSync: false,
+        url: _formatUrl(instance.getString(url)),
+        params: {
+          'device_id': instance.getString(id),
+        },
+      ),
+      logger: const bg.LoggerConfig(
+        logLevel: bg.LogLevel.verbose,
+        logMaxDays: 1,
+      ),
+      activity: bg.ActivityConfig(
+        disableStopDetection: instance.getBool(stopDetection) == false,
+      ),
+      persistence: bg.PersistenceConfig(
+        maxRecordsToPersist: instance.getBool(buffer) != false ? -1 : 1,
+        locationTemplate: _locationTemplate(),
       ),
-      showsBackgroundLocationIndicator: false,
     );
   }
 
diff --git a/pubspec.lock b/pubspec.lock
index 13e8cb8..4926d46 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -65,14 +65,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.13.0"
-  background_fetch:
-    dependency: transitive
-    description:
-      name: background_fetch
-      sha256: "6f0cec85480eac151f3971f883180d8c0acf6b40001153f1cf7c2c453df4f851"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.5.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -250,10 +242,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_background_geolocation
-      sha256: "6910bec29cfed37fe11972c0207411c36d26f62067f2465b22d0c1176da60f6c"
+      sha256: "506fc7d9f2a79c8f67057c1e83debe27b2f611aca464b77e0e14e3b0872db4ad"
       url: "https://pub.dev"
     source: hosted
-    version: "4.18.2"
+    version: "5.0.1"
   flutter_launcher_icons:
     dependency: "direct dev"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index c6eb85f..f5b2bd2 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -12,7 +12,7 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   intl: any
-  flutter_background_geolocation: ^4.18.2
+  flutter_background_geolocation: ^5.0.0
   shared_preferences: ^2.5.4
   firebase_core: ^4.3.0
   firebase_messaging: ^16.1.0