### New Features

- Added a cancel button for BLE scanning
- Tapping a repeater ID in TX, RX, or DISC ping results now shows a popup with the name of known repeaters
- Active Mode now sends heartbeat pings to maintain session

### Bug Fixes
- Fixed a bug that incorrectly dropped certain RX packets due to content filter rules
- Fixed Android notification issue

### Improvements
- Debug log uploads now chunk larger files to ensure successful delivery
- App now remembers your last choice for centre on map, heading, and rotate lock

Author: MrAlders0n

android/local.properties

@@ -1,5 +1,5 @@
 sdk.dir=/opt/homebrew/share/android-commandlinetools
 flutter.sdk=/opt/homebrew/share/flutter
-flutter.buildMode=release
+flutter.buildMode=debug
 flutter.versionName=1.0.0
-flutter.versionCode=1770442286
+flutter.versionCode=1

drive_route_map_feb6.html

@@ -13,6 +13,7 @@ import 'screens/main_scaffold.dart';
 import 'services/bluetooth/bluetooth_service.dart';
 import 'services/bluetooth/mobile_bluetooth.dart';
 import 'services/bluetooth/web_bluetooth.dart';
+import 'services/background_service.dart';
 import 'services/debug_file_logger.dart';
 import 'utils/constants.dart';
 import 'utils/debug_logger_io.dart';
@@ -63,6 +64,12 @@ void main() async {
     await _requestPermissions();
   }
 
+  // Clean up any orphaned background service from a previous session
+  // (Android foreground service can survive app process death)
+  if (!kIsWeb) {
+    await BackgroundServiceManager.cleanupOrphanedService();
+  }
+
   runApp(MeshMapperApp(initialThemeMode: initialThemeMode));
 }
 

lib/main.dart

@@ -55,6 +55,15 @@ class UserPreferences {
   /// Hybrid mode enabled (alternates Active + Discovery pings)
   final bool hybridModeEnabled;
 
+  /// Map auto-follow GPS position
+  final bool mapAutoFollow;
+
+  /// Map always north up (false = rotate with heading)
+  final bool mapAlwaysNorth;
+
+  /// Map rotation lock (disable rotation gestures)
+  final bool mapRotationLocked;
+
   const UserPreferences({
     this.powerLevel = 0.3,
     this.txPower = 22,
@@ -74,6 +83,9 @@ class UserPreferences {
     this.themeMode = 'dark',
     this.unitSystem = 'metric',
     this.hybridModeEnabled = false,
+    this.mapAutoFollow = false,
+    this.mapAlwaysNorth = true,
+    this.mapRotationLocked = false,
   });
 
   /// Create from JSON (for persistence)
@@ -97,6 +109,9 @@ class UserPreferences {
       themeMode: (json['themeMode'] as String?) ?? 'dark',
       unitSystem: (json['unitSystem'] as String?) ?? 'metric',
       hybridModeEnabled: (json['hybridModeEnabled'] as bool?) ?? false,
+      mapAutoFollow: (json['mapAutoFollow'] as bool?) ?? false,
+      mapAlwaysNorth: (json['mapAlwaysNorth'] as bool?) ?? true,
+      mapRotationLocked: (json['mapRotationLocked'] as bool?) ?? false,
     );
   }
 
@@ -121,6 +136,9 @@ class UserPreferences {
       'themeMode': themeMode,
       'unitSystem': unitSystem,
       'hybridModeEnabled': hybridModeEnabled,
+      'mapAutoFollow': mapAutoFollow,
+      'mapAlwaysNorth': mapAlwaysNorth,
+      'mapRotationLocked': mapRotationLocked,
     };
   }
 
@@ -144,6 +162,9 @@ class UserPreferences {
     String? themeMode,
     String? unitSystem,
     bool? hybridModeEnabled,
+    bool? mapAutoFollow,
+    bool? mapAlwaysNorth,
+    bool? mapRotationLocked,
   }) {
     return UserPreferences(
       powerLevel: powerLevel ?? this.powerLevel,
@@ -164,6 +185,9 @@ class UserPreferences {
       themeMode: themeMode ?? this.themeMode,
       unitSystem: unitSystem ?? this.unitSystem,
       hybridModeEnabled: hybridModeEnabled ?? this.hybridModeEnabled,
+      mapAutoFollow: mapAutoFollow ?? this.mapAutoFollow,
+      mapAlwaysNorth: mapAlwaysNorth ?? this.mapAlwaysNorth,
+      mapRotationLocked: mapRotationLocked ?? this.mapRotationLocked,
     );
   }
 
@@ -209,7 +233,10 @@ class UserPreferences {
         other.closeAppAfterDisconnect == closeAppAfterDisconnect &&
         other.themeMode == themeMode &&
         other.unitSystem == unitSystem &&
-        other.hybridModeEnabled == hybridModeEnabled;
+        other.hybridModeEnabled == hybridModeEnabled &&
+        other.mapAutoFollow == mapAutoFollow &&
+        other.mapAlwaysNorth == mapAlwaysNorth &&
+        other.mapRotationLocked == mapRotationLocked;
   }
 
   @override
@@ -232,6 +259,9 @@ class UserPreferences {
       themeMode,
       unitSystem,
       hybridModeEnabled,
+      mapAutoFollow,
+      mapAlwaysNorth,
+      mapRotationLocked,
     );
   }
 

lib/models/user_preferences.dart

@@ -136,6 +136,7 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
   // Discovered devices
   List<DiscoveredDevice> _discoveredDevices = [];
   bool _isScanning = false;
+  StreamSubscription<DiscoveredDevice>? _activeScanSubscription;
 
   // TX/RX markers for map
   final List<TxPing> _txPings = [];
@@ -433,7 +434,8 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
 
       // Update background service notification with queue size
       if (_autoPingEnabled) {
-        final modeName = _autoMode == AutoMode.passive ? 'Passive Mode' : 'Active Mode';
+        final modeName = _autoMode == AutoMode.passive ? 'Passive Mode'
+            : _autoMode == AutoMode.hybrid ? 'Hybrid Mode' : 'Active Mode';
         BackgroundServiceManager.updateNotification(
           mode: modeName,
           txCount: _pingStats.txCount,
@@ -717,31 +719,46 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
     _isAuthError = false;
     notifyListeners();
 
-    // Listen for discovered devices
+    // Listen for discovered devices using subscription so stopScan() can cancel
     DiscoveredDevice? selectedDevice;
-    await for (final device in _bluetoothService.scanForDevices(
+    final completer = Completer<void>();
+    _activeScanSubscription = _bluetoothService.scanForDevices(
       timeout: const Duration(seconds: 15),
-    )) {
-      if (!_discoveredDevices.any((d) => d.id == device.id)) {
-        _discoveredDevices.add(device);
-        selectedDevice = device;
-        notifyListeners();
-      }
-    }
+    ).listen(
+      (device) {
+        if (!_discoveredDevices.any((d) => d.id == device.id)) {
+          _discoveredDevices.add(device);
+          selectedDevice = device;
+          notifyListeners();
+        }
+      },
+      onDone: () {
+        if (!completer.isCompleted) completer.complete();
+      },
+      onError: (e) {
+        debugError('[SCAN] Scan error: $e');
+        if (!completer.isCompleted) completer.complete();
+      },
+    );
+    await completer.future;
+    _activeScanSubscription = null;
 
     _isScanning = false;
     notifyListeners();
 
     // On web platform, the Chrome BLE picker already handles device selection,
     // so auto-connect immediately after the picker returns (no second click needed)
-    if (kIsWeb && selectedDevice != null) {
+    final webDevice = selectedDevice;
+    if (kIsWeb && webDevice != null) {
       debugLog('[APP] Web platform: auto-connecting to selected device');
-      await connectToDevice(selectedDevice);
+      await connectToDevice(webDevice);
     }
   }
 
   /// Stop scanning for devices
   Future<void> stopScan() async {
+    await _activeScanSubscription?.cancel();
+    _activeScanSubscription = null;
     await _bluetoothService.stopScan();
     _isScanning = false;
     notifyListeners();
@@ -1077,7 +1094,8 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
 
         // Update background service notification with current stats
         if (_autoPingEnabled) {
-          final modeName = _autoMode == AutoMode.passive ? 'Passive Mode' : 'Active Mode';
+          final modeName = _autoMode == AutoMode.passive ? 'Passive Mode'
+            : _autoMode == AutoMode.hybrid ? 'Hybrid Mode' : 'Active Mode';
           BackgroundServiceManager.updateNotification(
             mode: modeName,
             txCount: _pingStats.txCount,
@@ -2083,10 +2101,11 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
       final sessionLabel = isPassive ? 'passive' : isHybrid ? 'hybrid' : 'active';
       _startNoiseFloorSession(sessionLabel);
 
-      // Enable heartbeat ONLY for Passive Mode (not offline mode)
-      // Active/Hybrid Mode renews session via auto-pings every 15/30/60s
-      // Manual Mode has natural 5-minute timeout
-      if (isPassive && !_preferences.offlineMode) {
+      // Enable heartbeat for all auto-ping modes (not offline mode)
+      // Heartbeat sends keepalive ~1 min before session expiry (4 min timer)
+      // Active/Hybrid pings renew session when moving, but heartbeat is the
+      // safety net when stationary (25m distance filter skips TX pings)
+      if (!_preferences.offlineMode) {
         _apiService.enableHeartbeat(
           gpsProvider: () {
             // Provide current GPS coordinates for heartbeat (matching wardrive.js)
@@ -2095,9 +2114,7 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
             return (lat: pos.latitude, lon: pos.longitude);
           },
         );
-        debugLog('[HEARTBEAT] Enabled for Passive Mode');
-      } else if (isTxMode) {
-        debugLog('[HEARTBEAT] Not enabled - ${mode.name} Mode renews via auto-pings');
+        debugLog('[HEARTBEAT] Enabled for ${mode.name} Mode');
       }
 
       // Start background service for continuous operation
@@ -2676,6 +2693,30 @@ class AppStateProvider extends ChangeNotifier with WidgetsBindingObserver {
     _savePreferences();
   }
 
+  /// Set map auto-follow preference and persist
+  void setMapAutoFollow(bool value) {
+    _preferences = _preferences.copyWith(mapAutoFollow: value);
+    debugLog('[MAP] Map auto-follow set to $value');
+    notifyListeners();
+    _savePreferences();
+  }
+
+  /// Set map always-north preference and persist
+  void setMapAlwaysNorth(bool value) {
+    _preferences = _preferences.copyWith(mapAlwaysNorth: value);
+    debugLog('[MAP] Map always-north set to $value');
+    notifyListeners();
+    _savePreferences();
+  }
+
+  /// Set map rotation-locked preference and persist
+  void setMapRotationLocked(bool value) {
+    _preferences = _preferences.copyWith(mapRotationLocked: value);
+    debugLog('[MAP] Map rotation-locked set to $value');
+    notifyListeners();
+    _savePreferences();
+  }
+
   /// Toggle sound notifications on/off
   Future<void> toggleSoundEnabled() async {
     await _audioService.toggle();

lib/providers/app_state_provider.dart

@@ -76,12 +76,26 @@ class _ConnectionScreenState extends State<ConnectionScreen> with WidgetsBinding
     final appState = context.watch<AppStateProvider>();
     final isLandscape = MediaQuery.of(context).orientation == Orientation.landscape;
 
-    // Build FAB for scanning - only show when fully disconnected and idle
+    // Build FAB for scanning - show Cancel during scan, Scan when idle
     // Hide FAB entirely during maintenance mode (maintenance UI has its own buttons)
     // Hide FAB when Bluetooth is off (shows full-screen message instead)
     // Hide FAB during auto-reconnect
     Widget? fab;
-    if (appState.connectionStep == ConnectionStep.disconnected &&
+    if (appState.isScanning) {
+      // Show Cancel FAB during active scan
+      fab = isLandscape
+          ? FloatingActionButton.small(
+              onPressed: () => appState.stopScan(),
+              backgroundColor: Colors.red,
+              child: const Icon(Icons.close),
+            )
+          : FloatingActionButton.extended(
+              onPressed: () => appState.stopScan(),
+              icon: const Icon(Icons.close),
+              label: const Text('Cancel'),
+              backgroundColor: Colors.red,
+            );
+    } else if (appState.connectionStep == ConnectionStep.disconnected &&
         !appState.isAutoReconnecting &&
         (!appState.maintenanceMode || appState.offlineMode) &&
         !appState.isBluetoothOff) {