Fixed BLE Device Name being wrong

Author: MrAlders0n

ios/Flutter/Generated.xcconfig

@@ -2,14 +2,14 @@
 FLUTTER_ROOT=/opt/homebrew/share/flutter
 FLUTTER_APPLICATION_PATH=/Users/schnobbc/Documents/Github/MeshMapper_Flutter_App
 COCOAPODS_PARALLEL_CODE_SIGN=true
-FLUTTER_TARGET=lib/main.dart
+FLUTTER_TARGET=/Users/schnobbc/Documents/Github/MeshMapper_Flutter_App/lib/main.dart
 FLUTTER_BUILD_DIR=build
 FLUTTER_BUILD_NAME=1.0.0
-FLUTTER_BUILD_NUMBER=1769234591
+FLUTTER_BUILD_NUMBER=1
 EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
 EXCLUDED_ARCHS[sdk=iphoneos*]=armv7
-DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NjkyMzQ1OTE=,RkxVVFRFUl9WRVJTSU9OPTMuMzguNw==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049M2I2MmVmYzJhMw==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NzhmYzMwMTJlNA==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC43
+DART_DEFINES=RkxVVFRFUl9WRVJTSU9OPTMuMzguNw==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049M2I2MmVmYzJhMw==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NzhmYzMwMTJlNA==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC43
 DART_OBFUSCATION=false
-TRACK_WIDGET_CREATION=false
-TREE_SHAKE_ICONS=true
+TRACK_WIDGET_CREATION=true
+TREE_SHAKE_ICONS=false
 PACKAGE_CONFIG=/Users/schnobbc/Documents/Github/MeshMapper_Flutter_App/.dart_tool/package_config.json

ios/Flutter/flutter_export_environment.sh

@@ -3,12 +3,12 @@
 export "FLUTTER_ROOT=/opt/homebrew/share/flutter"
 export "FLUTTER_APPLICATION_PATH=/Users/schnobbc/Documents/Github/MeshMapper_Flutter_App"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
-export "FLUTTER_TARGET=lib/main.dart"
+export "FLUTTER_TARGET=/Users/schnobbc/Documents/Github/MeshMapper_Flutter_App/lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "FLUTTER_BUILD_NAME=1.0.0"
-export "FLUTTER_BUILD_NUMBER=1769234591"
-export "DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NjkyMzQ1OTE=,RkxVVFRFUl9WRVJTSU9OPTMuMzguNw==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049M2I2MmVmYzJhMw==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NzhmYzMwMTJlNA==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC43"
+export "FLUTTER_BUILD_NUMBER=1"
+export "DART_DEFINES=RkxVVFRFUl9WRVJTSU9OPTMuMzguNw==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049M2I2MmVmYzJhMw==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NzhmYzMwMTJlNA==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC43"
 export "DART_OBFUSCATION=false"
-export "TRACK_WIDGET_CREATION=false"
-export "TREE_SHAKE_ICONS=true"
+export "TRACK_WIDGET_CREATION=true"
+export "TREE_SHAKE_ICONS=false"
 export "PACKAGE_CONFIG=/Users/schnobbc/Documents/Github/MeshMapper_Flutter_App/.dart_tool/package_config.json"

lib/providers/app_state_provider.dart

@@ -1195,6 +1195,12 @@ class AppStateProvider extends ChangeNotifier {
   Future<bool> sendPing() async {
     if (_pingService == null) return false;
 
+    // Check session validity before starting (skip in offline mode)
+    if (!_preferences.offlineMode) {
+      final sessionCheck = await _checkSessionBeforeAction();
+      if (!sessionCheck) return false;
+    }
+
     // Set sending state immediately for instant UI feedback
     _isPingSending = true;
     notifyListeners();
@@ -1209,6 +1215,27 @@ class AppStateProvider extends ChangeNotifier {
     }
   }
 
+  /// Check session validity before starting a wardrive action
+  /// Returns true if session is valid, false if expired (triggers disconnect)
+  Future<bool> _checkSessionBeforeAction() async {
+    final pos = _gpsService?.lastPosition;
+    final result = await _apiService.checkSessionValid(
+      lat: pos?.latitude,
+      lon: pos?.longitude,
+    );
+
+    if (!result.isValid) {
+      debugWarn('[APP] Session check failed before action: ${result.reason} - ${result.message}');
+      _statusMessageService.setDynamicStatus(
+        result.message ?? 'Session expired',
+        StatusColor.error,
+      );
+      // Note: onSessionError callback will trigger disconnect for critical errors
+      return false;
+    }
+    return true;
+  }
+
   /// Toggle auto-ping mode (TX/RX or RX-only)
   /// Returns false if blocked by cooldown (TX/RX Auto only - RX Auto ignores cooldown)
   Future<bool> toggleAutoPing(AutoMode mode) async {
@@ -1266,6 +1293,12 @@ class AppStateProvider extends ChangeNotifier {
         debugLog('[RX AUTO] Stopped - no cooldown (passive mode)');
       }
     } else {
+      // Check session validity before starting (skip in offline mode)
+      if (!_preferences.offlineMode) {
+        final sessionCheck = await _checkSessionBeforeAction();
+        if (!sessionCheck) return false;
+      }
+
       // Block starting if shared cooldown is active (TX/RX Auto only)
       // RX Auto is passive listening and can start during cooldown
       if (!isRxOnly && _cooldownTimer.isRunning) {
@@ -2258,6 +2291,11 @@ class AppStateProvider extends ChangeNotifier {
       name: _rememberedDevice!.name,
     );
 
+    // Pre-populate the BLE scan cache with remembered device info
+    // This ensures the device name is available during connect()
+    // (normally populated by scanning, but we're skipping the scan)
+    _bluetoothService.cacheDeviceInfo(device);
+
     await connectToDevice(device);
   }
 

lib/services/api_service.dart

@@ -253,9 +253,9 @@ class ApiService {
         };
       }
 
-      // Log the full request payload
-      debugLog('[HEARTBEAT] POST $wardriveEndpoint');
-      debugLog('[HEARTBEAT] Payload: ${json.encode(payload)}');
+      // Log heartbeat request (hide sensitive payload details)
+      final hasCoords = lat != null && lon != null;
+      debugLog('[HEARTBEAT] POST (with GPS: $hasCoords)');
 
       final response = await _client.post(
         Uri.parse(wardriveEndpoint),
@@ -282,6 +282,50 @@ class ApiService {
     }
   }
 
+  /// Check if session is still valid by sending a heartbeat
+  /// Use this before starting any wardrive action (Send Ping, Active Mode, Passive Mode)
+  /// Returns (isValid, errorReason, errorMessage)
+  Future<({bool isValid, String? reason, String? message})> checkSessionValid({
+    double? lat,
+    double? lon,
+  }) async {
+    if (_sessionId == null) {
+      debugWarn('[SESSION] No session to validate');
+      return (isValid: false, reason: 'no_session', message: 'No active session');
+    }
+
+    debugLog('[SESSION] Checking session validity via heartbeat...');
+    final result = await sendHeartbeat(lat: lat, lon: lon);
+
+    if (result == null) {
+      debugWarn('[SESSION] Session check failed: no response');
+      return (isValid: false, reason: 'no_response', message: 'Server did not respond');
+    }
+
+    if (result['success'] == true) {
+      debugLog('[SESSION] Session is valid (expires_at: ${result['expires_at']})');
+      return (isValid: true, reason: null, message: null);
+    }
+
+    // Session is invalid - check reason
+    final reason = result['reason'] as String?;
+    final message = result['message'] as String?;
+    debugWarn('[SESSION] Session invalid: $reason - $message');
+
+    // Trigger session error callback for critical errors
+    const criticalErrors = {
+      'session_expired', 'session_invalid', 'session_revoked', 'bad_session',
+      'invalid_key', 'unauthorized', 'bad_key',
+      'outside_zone', 'zone_full',
+    };
+    if (criticalErrors.contains(reason)) {
+      _clearSession();
+      onSessionError?.call(reason, message);
+    }
+
+    return (isValid: false, reason: reason, message: message);
+  }
+
   /// Enable heartbeat mode (called when auto mode starts)
   /// Heartbeat is scheduled based on expires_at from API responses
   /// @param gpsProvider Callback to get current GPS coordinates for heartbeat

lib/services/bluetooth/bluetooth_service.dart

@@ -69,6 +69,10 @@ abstract class BluetoothService {
   /// Write data to device
   Future<void> write(Uint8List data);
 
+  /// Pre-populate device cache with known device info
+  /// Used for remembered devices to ensure name is available during connect
+  void cacheDeviceInfo(DiscoveredDevice device);
+
   /// Dispose of resources
   void dispose();
 }

lib/services/bluetooth/mobile_bluetooth.dart

@@ -408,6 +408,12 @@ class MobileBluetoothService implements BluetoothService {
     await _rxCharacteristic!.write(data, withoutResponse: false);
   }
 
+  @override
+  void cacheDeviceInfo(DiscoveredDevice device) {
+    _scannedDevices[device.id] = device;
+    print('[BLE] Cached device info: ${device.name} (${device.id})');
+  }
+
   @override
   void dispose() {
     _isDisposed = true;

lib/services/bluetooth/web_bluetooth.dart

@@ -250,6 +250,12 @@ class WebBluetoothService implements BluetoothService {
     await _rxCharacteristic!.writeValueWithoutResponse(data);
   }
 
+  @override
+  void cacheDeviceInfo(DiscoveredDevice device) {
+    // Web Bluetooth uses _pendingDevice from requestDevice dialog
+    // No caching needed - this method is for mobile remembered devices
+  }
+
   @override
   void dispose() {
     _notificationSubscription?.cancel();