fix: Tame rapid GPS updates #41

ios/Runner.xcodeproj/project.pbxproj

@@ -489,7 +489,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 125;
+				CURRENT_PROJECT_VERSION = 126;
 				DEVELOPMENT_TEAM = JND55328G8;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -511,7 +511,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 125;
+				CURRENT_PROJECT_VERSION = 126;
 				DEVELOPMENT_TEAM = JND55328G8;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
@@ -530,7 +530,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 125;
+				CURRENT_PROJECT_VERSION = 126;
 				DEVELOPMENT_TEAM = JND55328G8;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
@@ -547,7 +547,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 125;
+				CURRENT_PROJECT_VERSION = 126;
 				DEVELOPMENT_TEAM = JND55328G8;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
@@ -679,7 +679,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 125;
+				CURRENT_PROJECT_VERSION = 126;
 				DEVELOPMENT_TEAM = JND55328G8;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -702,7 +702,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 125;
+				CURRENT_PROJECT_VERSION = 126;
 				DEVELOPMENT_TEAM = JND55328G8;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;

ios/Runner/Info.plist

@@ -43,7 +43,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>125</string>
+	<string>126</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>ITSAppUsesNonExemptEncryption</key>

ios/fastlane/report.xml

@@ -5,22 +5,22 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000216">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000231">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: increment_build_number" time="1.086406">
+      <testcase classname="fastlane.lanes" name="1: increment_build_number" time="0.728696">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: build_app" time="96.919368">
+      <testcase classname="fastlane.lanes" name="2: build_app" time="101.589371">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: upload_to_app_store" time="563.579992">
+      <testcase classname="fastlane.lanes" name="3: upload_to_app_store" time="690.798016">
         
       </testcase>
     

lib/providers/messages_provider.dart

@@ -664,6 +664,11 @@ class MessagesProvider with ChangeNotifier {
       return; // Skip duplicate
     }
 
+    final matchingSentReplayIndex = _findMatchingSentReplayIndex(finalMessage);
+    if (matchingSentReplayIndex != -1) {
+      _clearChannelSendWarning(_messages[matchingSentReplayIndex].id);
+    }
+
     _messages.add(finalMessage);
     if (contactLocationSnapshot != null) {
       _messageContactLocations[finalMessage.id] = contactLocationSnapshot;
@@ -712,7 +717,8 @@ class MessagesProvider with ChangeNotifier {
 
     for (int index = 0; index < _messages.length; index++) {
       final existing = _messages[index];
-      if (!_matchesDuplicateScope(existing, message) ||
+      if (existing.isSentMessage ||
+          !_matchesDuplicateScope(existing, message) ||
           existing.text != message.text) {
         continue;
       }
@@ -790,6 +796,27 @@ class MessagesProvider with ChangeNotifier {
         existingSenderName == incomingSenderName;
   }
 
+  int _findMatchingSentReplayIndex(Message message) {
+    if (!message.isChannelMessage || message.isSentMessage) {
+      return -1;
+    }
+
+    for (int index = 0; index < _messages.length; index++) {
+      final existing = _messages[index];
+      if (!existing.isSentMessage ||
+          !existing.isChannelMessage ||
+          existing.text != message.text) {
+        continue;
+      }
+
+      if (_matchesDuplicateScope(existing, message)) {
+        return index;
+      }
+    }
+
+    return -1;
+  }
+
   /// Add multiple messages
   void addMessages(List<Message> messages) {
     int addedCount = 0;

lib/screens/settings_screen.dart

@@ -341,7 +341,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           keyboardType: const TextInputType.numberWithOptions(decimal: true),
           decoration: const InputDecoration(
             labelText: 'Meters',
-            helperText: 'Valid range: 1 to 1000 meters',
+            helperText: 'Valid range: 10 to 1000 meters',
           ),
         ),
         actions: [
@@ -353,7 +353,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
             onPressed: () {
               final parsed = double.tryParse(controller.text.trim());
               if (parsed == null) return;
-              Navigator.pop(context, parsed.clamp(1.0, 1000.0));
+              Navigator.pop(context, parsed.clamp(10.0, 1000.0));
             },
             child: const Text('Save'),
           ),
@@ -382,7 +382,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
           keyboardType: TextInputType.number,
           decoration: const InputDecoration(
             labelText: 'Seconds',
-            helperText: 'Valid range: 5 to 60 seconds',
+            helperText: 'Valid range: 10 to 31 seconds',
           ),
         ),
         actions: [
@@ -394,7 +394,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
             onPressed: () {
               final parsed = int.tryParse(controller.text.trim());
               if (parsed == null) return;
-              Navigator.pop(context, parsed.clamp(5, 60));
+              Navigator.pop(context, parsed.clamp(10, 31));
             },
             child: const Text('Save'),
           ),

lib/services/app_config_snapshot_service.dart

@@ -144,11 +144,11 @@ class AppConfigSnapshotService {
     }
     if (section.fastLocationMovementThresholdMeters != null) {
       locationTracking.fastLocationMovementThresholdMeters =
-          section.fastLocationMovementThresholdMeters!;
+          section.fastLocationMovementThresholdMeters!.clamp(10.0, 1000.0);
     }
     if (section.fastLocationActiveCadenceSeconds != null) {
       locationTracking.fastLocationActiveCadenceSeconds =
-          section.fastLocationActiveCadenceSeconds!;
+          section.fastLocationActiveCadenceSeconds!.clamp(10, 31);
     }
     await locationTracking.saveSettings();
     await appProvider.reloadProfileScopedSettings();

lib/services/location_tracking_service.dart

@@ -20,6 +20,14 @@ import 'profiles_feature_service.dart';
 /// - MeshCore mesh network integration
 /// - Real-time position updates via callbacks
 class LocationTrackingService {
+  static const double _defaultFastLocationMovementThresholdMeters = 10.0;
+  static const double _minFastLocationMovementThresholdMeters = 10.0;
+  static const int _defaultFastLocationActiveCadenceSeconds = 10;
+  static const int _minFastLocationActiveCadenceSeconds = 10;
+  static const int _maxFastLocationActiveCadenceSeconds = 31;
+  static const Duration _fastLocationMinimumUpdateInterval = Duration(
+    seconds: 31,
+  );
   // ============================================================================
   // Singleton Pattern
   // ============================================================================
@@ -75,10 +83,12 @@ class LocationTrackingService {
   bool fastLocationUpdatesEnabled = false;
 
   /// Distance threshold for fast GPS updates
-  double fastLocationMovementThresholdMeters = 10.0;
+  double fastLocationMovementThresholdMeters =
+      _defaultFastLocationMovementThresholdMeters;
 
   /// Cadence for active-use fast GPS updates
-  int fastLocationActiveCadenceSeconds = 10;
+  int fastLocationActiveCadenceSeconds =
+      _defaultFastLocationActiveCadenceSeconds;
 
   /// Target channel index for fast GPS updates; null means disabled/unset.
   int? fastLocationChannelIdx;
@@ -522,12 +532,18 @@ class LocationTrackingService {
   }
 
   Future<void> updateFastLocationMovementThreshold(double meters) async {
-    fastLocationMovementThresholdMeters = meters.clamp(1.0, 1000.0);
+    fastLocationMovementThresholdMeters = meters.clamp(
+      _minFastLocationMovementThresholdMeters,
+      1000.0,
+    );
     await saveSettings();
   }
 
   Future<void> updateFastLocationActiveCadenceSeconds(int seconds) async {
-    fastLocationActiveCadenceSeconds = seconds.clamp(5, 60);
+    fastLocationActiveCadenceSeconds = seconds.clamp(
+      _minFastLocationActiveCadenceSeconds,
+      _maxFastLocationActiveCadenceSeconds,
+    );
     await saveSettings();
     _refreshFastLocationTimer();
   }
@@ -583,6 +599,11 @@ class LocationTrackingService {
     final now = DateTime.now();
     final previous = _lastFastLocationSentPosition;
     final previousTime = _lastFastLocationSentAt;
+    if (previousTime != null &&
+        now.difference(previousTime) < _fastLocationMinimumUpdateInterval) {
+      return;
+    }
+
     if (previous != null && previousTime != null) {
       final distance = Geolocator.distanceBetween(
         previous.latitude,
@@ -673,12 +694,14 @@ class LocationTrackingService {
         prefs.getBool(_scopedKey(_prefKeyFastLocationEnabled)) ?? false;
     fastLocationMovementThresholdMeters =
         (prefs.getDouble(_scopedKey(_prefKeyFastMovementThreshold)) ??
-                gpsUpdateDistance)
+                _defaultFastLocationMovementThresholdMeters)
-            .clamp(1.0, 1000.0);
+            .clamp(_minFastLocationMovementThresholdMeters, 1000.0);
     fastLocationActiveCadenceSeconds =
-        (prefs.getInt(_scopedKey(_prefKeyFastActiveCadence)) ?? 10).clamp(
+        (prefs.getInt(_scopedKey(_prefKeyFastActiveCadence)) ??
-          5,
+                _defaultFastLocationActiveCadenceSeconds)
-          60,
+            .clamp(
+          _minFastLocationActiveCadenceSeconds,
+          _maxFastLocationActiveCadenceSeconds,
         );
     fastLocationChannelIdx = prefs.getInt(_scopedKey(_prefKeyFastChannelIdx));
 

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 2026.0322.2+39
+version: 2026.0323.2+41
 
 environment:
   sdk: ^3.9.2

test/providers/messages_provider_retransmission_test.dart

@@ -214,7 +214,7 @@ void main() {
       });
     });
 
-    test('channel warning clears when replay is deduped into sent bubble', () {
+    test('channel warning clears when replay arrives after send', () {
       fakeAsync((async) {
         final provider = MessagesProvider();
         provider.resolveContactNameCallback = (_) => 'dz0ny (SI)';
@@ -239,11 +239,11 @@ void main() {
         );
 
         expect(provider.hasChannelSendWarning('c-warn-replay'), isFalse);
-        expect(provider.messages, hasLength(1));
+        expect(provider.messages, hasLength(2));
       });
     });
 
-    test('channel replay is deduped for self sender within repeat window', () {
+    test('channel replay is kept separate for self sender within repeat window', () {
       final provider = MessagesProvider();
       provider.resolveContactNameCallback = (_) => 'dz0ny (SI)';
       provider.addSentMessage(
@@ -259,9 +259,10 @@ void main() {
         ),
       );
 
-      expect(provider.messages, hasLength(1));
+      expect(provider.messages, hasLength(2));
-      expect(provider.messages.single.id, equals('c-echo'));
+      expect(provider.messages.first.id, equals('c-echo'));
-      expect(provider.messages.single.senderName, equals('dz0ny (SI)'));
+      expect(provider.messages.last.id, equals('c-echo-incoming'));
+      expect(provider.messages.last.senderName, equals('dz0ny (SI)'));
     });
 
     test(
@@ -308,7 +309,7 @@ void main() {
       expect(provider.messages, hasLength(2));
     });
 
-    test('channel replay can dedupe using lazily resolved self name', () {
+    test('channel replay stays separate using lazily resolved self name', () {
       final provider = MessagesProvider();
       provider.addSentMessage(
         _buildSentChannelMessage(id: 'c-lazy', senderTimestamp: 1700000400),
@@ -324,11 +325,12 @@ void main() {
         ),
       );
 
-      expect(provider.messages, hasLength(1));
+      expect(provider.messages, hasLength(2));
-      expect(provider.messages.single.id, equals('c-lazy'));
+      expect(provider.messages.first.id, equals('c-lazy'));
+      expect(provider.messages.last.id, equals('c-lazy-incoming'));
     });
 
-    test('channel replay dedupes meshcore-prefixed self sender name', () {
+    test('channel replay stays separate for meshcore-prefixed self sender name', () {
       final provider = MessagesProvider();
       provider.resolveContactNameCallback = (_) => 'MeshCore-dz0ny (SI)';
       provider.addSentMessage(
@@ -344,8 +346,9 @@ void main() {
         ),
       );
 
-      expect(provider.messages, hasLength(1));
+      expect(provider.messages, hasLength(2));
-      expect(provider.messages.single.id, equals('c-prefix'));
+      expect(provider.messages.first.id, equals('c-prefix'));
+      expect(provider.messages.last.id, equals('c-prefix-incoming'));
     });
 
     test('duplicate incoming message increments received copy count', () {

test/services/location_tracking_service_test.dart

@@ -19,6 +19,13 @@ void main() {
     service.fastLocationChannelIdx = null;
   });
 
+  test('loads conservative fast location defaults', () async {
+    await service.loadSettings();
+
+    expect(service.fastLocationMovementThresholdMeters, 10.0);
+    expect(service.fastLocationActiveCadenceSeconds, 10);
+  });
+
   test('persists and restores fast location channel idx', () async {
     await service.updateFastLocationChannelIdx(3);
 
@@ -37,4 +44,12 @@ void main() {
 
     expect(service.fastLocationChannelIdx, isNull);
   });
+
+  test('clamps fast location settings to conservative limits', () async {
+    await service.updateFastLocationMovementThreshold(3);
+    await service.updateFastLocationActiveCadenceSeconds(45);
+
+    expect(service.fastLocationMovementThresholdMeters, 10.0);
+    expect(service.fastLocationActiveCadenceSeconds, 31);
+  });
 }