Update build configuration and enhance Bluetooth device handling

- Change Flutter build mode to release and update version code
- Simplify target path in configuration files
- Refactor heartbeat logic to schedule based on session expiry
- Preserve scanned device names for better connection handling in Bluetooth services
- Improve logging for device connection and scanning processes

Author: MrAlders0n

android/local.properties

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

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=/Users/schnobbc/Documents/Github/MeshMapper_Flutter_App/lib/main.dart
+FLUTTER_TARGET=lib/main.dart
 FLUTTER_BUILD_DIR=build
 FLUTTER_BUILD_NAME=1.0.0
-FLUTTER_BUILD_NUMBER=1
+FLUTTER_BUILD_NUMBER=1769234591
 EXCLUDED_ARCHS[sdk=iphonesimulator*]=i386
 EXCLUDED_ARCHS[sdk=iphoneos*]=armv7
-DART_DEFINES=RkxVVFRFUl9WRVJTSU9OPTMuMzguNw==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049M2I2MmVmYzJhMw==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NzhmYzMwMTJlNA==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC43
+DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NjkyMzQ1OTE=,RkxVVFRFUl9WRVJTSU9OPTMuMzguNw==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049M2I2MmVmYzJhMw==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NzhmYzMwMTJlNA==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC43
 DART_OBFUSCATION=false
-TRACK_WIDGET_CREATION=true
-TREE_SHAKE_ICONS=false
+TRACK_WIDGET_CREATION=false
+TREE_SHAKE_ICONS=true
 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=/Users/schnobbc/Documents/Github/MeshMapper_Flutter_App/lib/main.dart"
+export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
 export "FLUTTER_BUILD_NAME=1.0.0"
-export "FLUTTER_BUILD_NUMBER=1"
-export "DART_DEFINES=RkxVVFRFUl9WRVJTSU9OPTMuMzguNw==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049M2I2MmVmYzJhMw==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NzhmYzMwMTJlNA==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC43"
+export "FLUTTER_BUILD_NUMBER=1769234591"
+export "DART_DEFINES=QVBQX1ZFUlNJT049QVBQLTE3NjkyMzQ1OTE=,RkxVVFRFUl9WRVJTSU9OPTMuMzguNw==,RkxVVFRFUl9DSEFOTkVMPXN0YWJsZQ==,RkxVVFRFUl9HSVRfVVJMPWh0dHBzOi8vZ2l0aHViLmNvbS9mbHV0dGVyL2ZsdXR0ZXIuZ2l0,RkxVVFRFUl9GUkFNRVdPUktfUkVWSVNJT049M2I2MmVmYzJhMw==,RkxVVFRFUl9FTkdJTkVfUkVWSVNJT049NzhmYzMwMTJlNA==,RkxVVFRFUl9EQVJUX1ZFUlNJT049My4xMC43"
 export "DART_OBFUSCATION=false"
-export "TRACK_WIDGET_CREATION=true"
-export "TREE_SHAKE_ICONS=false"
+export "TRACK_WIDGET_CREATION=false"
+export "TREE_SHAKE_ICONS=true"
 export "PACKAGE_CONFIG=/Users/schnobbc/Documents/Github/MeshMapper_Flutter_App/.dart_tool/package_config.json"

lib/services/api_service.dart

@@ -25,8 +25,8 @@ class ApiService {
   /// API key (matching wardrive.js)
   static const String apiKey = '59C7754DABDF5C11CA5F5D8368F89';
 
-  /// Heartbeat idle timeout (send keepalive after 3 minutes of no API activity)
-  static const Duration heartbeatIdleTimeout = Duration(minutes: 3);
+  /// Heartbeat buffer - schedule heartbeat 1 minute before session expiry
+  static const Duration heartbeatBuffer = Duration(minutes: 1);
 
   final http.Client _client;
   bool _heartbeatEnabled = false;  // Track if heartbeat mode is active
@@ -215,12 +215,10 @@ class ApiService {
 
       final data = json.decode(response.body) as Map<String, dynamic>;
 
-      // Update expires_at if provided and reset heartbeat idle timer
-      if (data['success'] == true) {
-        if (data['expires_at'] != null) {
-          _sessionExpiresAt = data['expires_at'] as int;
-        }
-        _resetHeartbeatTimer();  // Resets 3-min idle timer on each successful upload
+      // Update expires_at and schedule heartbeat if provided
+      if (data['success'] == true && data['expires_at'] != null) {
+        _sessionExpiresAt = data['expires_at'] as int;
+        scheduleHeartbeat(_sessionExpiresAt!);
       }
 
       return data;
@@ -236,6 +234,7 @@ class ApiService {
     double? lon,
   }) async {
     if (_sessionId == null) {
+      debugLog('[HEARTBEAT] Cannot send heartbeat: no session_id');
       return null;
     }
 
@@ -254,6 +253,10 @@ class ApiService {
         };
       }
 
+      // Log the full request payload
+      debugLog('[HEARTBEAT] POST $wardriveEndpoint');
+      debugLog('[HEARTBEAT] Payload: ${json.encode(payload)}');
+
       final response = await _client.post(
         Uri.parse(wardriveEndpoint),
         headers: {'Content-Type': 'application/json'},
@@ -262,25 +265,34 @@ class ApiService {
 
       final data = json.decode(response.body) as Map<String, dynamic>;
 
-      // Update expires_at if provided (timer reset handled by _resetHeartbeatTimer in caller)
+      // Log the response (matching wardrive.js logging)
+      debugLog('[HEARTBEAT] Response status: ${response.statusCode}');
+      debugLog('[HEARTBEAT] Response data: ${json.encode(data)}');
+
+      // Update expires_at and schedule next heartbeat if provided
       if (data['success'] == true && data['expires_at'] != null) {
         _sessionExpiresAt = data['expires_at'] as int;
+        scheduleHeartbeat(_sessionExpiresAt!);
       }
 
       return data;
     } catch (e) {
+      debugError('[HEARTBEAT] Request failed: $e');
       return null;
     }
   }
 
   /// Enable heartbeat mode (called when auto mode starts)
-  /// Heartbeat fires after 3 minutes of API inactivity to keep session alive
+  /// Heartbeat is scheduled based on expires_at from API responses
   /// @param gpsProvider Callback to get current GPS coordinates for heartbeat
   void enableHeartbeat({({double lat, double lon})? Function()? gpsProvider}) {
     _heartbeatEnabled = true;
     _gpsProvider = gpsProvider;
-    _resetHeartbeatTimer();
-    debugLog('[API] Heartbeat mode enabled (3 min idle timeout)');
+    // Schedule initial heartbeat if we have an expiry time
+    if (_sessionExpiresAt != null) {
+      scheduleHeartbeat(_sessionExpiresAt!);
+    }
+    debugLog('[HEARTBEAT] Heartbeat mode enabled');
   }
 
   /// Disable heartbeat mode (called when auto mode stops)
@@ -289,32 +301,54 @@ class ApiService {
     _gpsProvider = null;
     _heartbeatTimer?.cancel();
     _heartbeatTimer = null;
-    debugLog('[API] Heartbeat mode disabled');
+    debugLog('[HEARTBEAT] Heartbeat mode disabled');
   }
 
-  /// Reset the heartbeat timer (call after any API activity)
-  /// Timer fires 3 minutes after last API post to send keepalive
-  void _resetHeartbeatTimer() {
+  /// Schedule heartbeat to fire before session expires
+  /// Matches scheduleHeartbeat() in wardrive.js
+  /// @param expiresAt Unix timestamp when session expires
+  void scheduleHeartbeat(int expiresAt) {
+    // Cancel any existing heartbeat timer
+    _heartbeatTimer?.cancel();
+    _heartbeatTimer = null;
+
     if (!_heartbeatEnabled) return;
 
-    _heartbeatTimer?.cancel();
-    _heartbeatTimer = Timer(heartbeatIdleTimeout, () async {
-      debugLog('[API] Heartbeat timer fired (3 min idle), sending keepalive');
+    // Calculate when to send heartbeat (1 minute before expiry)
+    final now = DateTime.now().millisecondsSinceEpoch ~/ 1000;
+    final secondsUntilExpiry = expiresAt - now;
+    final secondsUntilHeartbeat = secondsUntilExpiry - heartbeatBuffer.inSeconds;
 
-      // Get GPS coordinates from provider (matching wardrive.js behavior)
-      final coords = _gpsProvider?.call();
-      final result = await sendHeartbeat(lat: coords?.lat, lon: coords?.lon);
+    if (secondsUntilHeartbeat <= 0) {
+      // Session is about to expire or already expired - send heartbeat immediately
+      debugWarn('[HEARTBEAT] Session expires in ${secondsUntilExpiry}s, sending immediately');
+      _sendScheduledHeartbeat();
+      return;
+    }
 
-      if (result?['success'] == true) {
-        debugLog('[API] Heartbeat successful');
-        _resetHeartbeatTimer();  // Schedule next heartbeat
-      } else {
-        debugWarn('[API] Heartbeat failed: ${result?['message']}');
-        _onSessionExpiring?.call();
-      }
+    debugLog('[HEARTBEAT] Scheduling in ${secondsUntilHeartbeat}s (session expires in ${secondsUntilExpiry}s)');
+
+    _heartbeatTimer = Timer(Duration(seconds: secondsUntilHeartbeat), () {
+      debugLog('[HEARTBEAT] Timer fired, sending keepalive');
+      _sendScheduledHeartbeat();
     });
   }
 
+  /// Send scheduled heartbeat with GPS coordinates
+  Future<void> _sendScheduledHeartbeat() async {
+    // Get GPS coordinates from provider (matching wardrive.js behavior)
+    final coords = _gpsProvider?.call();
+    final result = await sendHeartbeat(lat: coords?.lat, lon: coords?.lon);
+
+    if (result?['success'] == true) {
+      debugLog('[HEARTBEAT] Heartbeat successful');
+      // Next heartbeat will be scheduled when we get new expires_at
+    } else {
+      debugWarn('[HEARTBEAT] Heartbeat failed: ${result?['message']}');
+      _onSessionExpiring?.call();
+    }
+  }
+
   /// Clear session data and cancel heartbeat timer
   void _clearSession() {
     _sessionId = null;

lib/services/bluetooth/mobile_bluetooth.dart

@@ -46,6 +46,10 @@ class MobileBluetoothService implements BluetoothService {
   StreamSubscription? _notificationSubscription;
   StreamSubscription? _scanSubscription;
 
+  // Store scanned device info for use in connect()
+  // This preserves the device name from scan results
+  final Map<String, DiscoveredDevice> _scannedDevices = {};
+
   @override
   Stream<ConnectionStatus> get connectionStream {
     _ensureControllers();
@@ -165,13 +169,18 @@ class MobileBluetoothService implements BluetoothService {
       // Listen for scan results
       _scanSubscription = fbp.FlutterBluePlus.scanResults.listen((results) {
         for (final result in results) {
+          final hasName = result.device.platformName.isNotEmpty;
+          final deviceName = hasName ? result.device.platformName : 'MeshCore Device';
+          if (!hasName) {
+            print('[BLE] WARNING: Device ${result.device.remoteId.str} has no platformName during scan, using fallback "MeshCore Device"');
+          }
           final device = DiscoveredDevice(
             id: result.device.remoteId.str,
-            name: result.device.platformName.isNotEmpty 
-                ? result.device.platformName 
-                : 'MeshCore Device',
+            name: deviceName,
             rssi: result.rssi,
           );
+          // Store device info for use in connect() - preserves name from scan
+          _scannedDevices[device.id] = device;
           controller.add(device);
         }
       });
@@ -308,12 +317,26 @@ class MobileBluetoothService implements BluetoothService {
         });
         print('[BLE] Notifications enabled');
 
+        // Use device name from scan results if available, fallback to platformName
+        final scannedDevice = _scannedDevices[deviceId];
+        String deviceName;
+        if (scannedDevice != null) {
+          deviceName = scannedDevice.name;
+        } else if (_bleDevice!.platformName.isNotEmpty) {
+          deviceName = _bleDevice!.platformName;
+        } else {
+          deviceName = 'MeshCore Device';
+          print('[BLE] WARNING: No device name available for $deviceId during connect - no scan cache, empty platformName. Using fallback "MeshCore Device"');
+        }
         _connectedDevice = DiscoveredDevice(
           id: deviceId,
-          name: _bleDevice!.platformName.isNotEmpty
-              ? _bleDevice!.platformName
-              : 'MeshCore Device',
+          name: deviceName,
         );
+        if (deviceName == 'MeshCore Device') {
+          print('[BLE] WARNING: Connected device name is "MeshCore Device" (from scan: ${scannedDevice != null}, scanName: ${scannedDevice?.name}, platformName: ${_bleDevice!.platformName})');
+        } else {
+          print('[BLE] Device name: $deviceName (from scan: ${scannedDevice != null}, platformName: ${_bleDevice!.platformName})');
+        }
 
         print('[BLE] Connection complete');
         _updateStatus(ConnectionStatus.connected);
@@ -358,6 +381,7 @@ class MobileBluetoothService implements BluetoothService {
     _bleDevice = null;
     _rxCharacteristic = null;
     _txCharacteristic = null;
+    _scannedDevices.clear(); // Clear scan cache on disconnect
     _notificationSubscription?.cancel();
     _notificationSubscription = null;
     _connectionStateSubscription?.cancel();

lib/services/bluetooth/web_bluetooth.dart

@@ -79,10 +79,14 @@ class WebBluetoothService implements BluetoothService {
         // Store the device for later connection (avoid requesting twice)
         _pendingDevice = device;
         debugLog('[BLE] Device selected: ${device.name ?? device.id}');
-        
+
+        final deviceName = device.name ?? 'MeshCore Device';
+        if (device.name == null) {
+          debugWarn('[BLE] WARNING: Device ${device.id} has no name during scan, using fallback "MeshCore Device"');
+        }
         yield DiscoveredDevice(
           id: device.id,
-          name: device.name ?? 'MeshCore Device',
+          name: deviceName,
         );
       }
     } catch (e) {
@@ -197,13 +201,21 @@ class WebBluetoothService implements BluetoothService {
         throw Exception('Failed to enable BLE notifications: $e');
       }
 
+      final deviceName = _device!.name ?? 'MeshCore Device';
+      if (_device!.name == null) {
+        debugWarn('[BLE] WARNING: Device ${_device!.id} has no name during connect, using fallback "MeshCore Device"');
+      }
       _connectedDevice = DiscoveredDevice(
         id: _device!.id,
-        name: _device!.name ?? 'MeshCore Device',
+        name: deviceName,
       );
 
       _updateStatus(ConnectionStatus.connected);
-      debugLog('[BLE] Connected successfully!');
+      if (deviceName == 'MeshCore Device') {
+        debugWarn('[BLE] WARNING: Connected device name is "MeshCore Device"');
+      } else {
+        debugLog('[BLE] Connected successfully as: $deviceName');
+      }
     } catch (e) {
       debugError('[BLE] Connection failed: $e');
       _updateStatus(ConnectionStatus.error);