Limit media fetch hops and warn user

- No automatic IR1 requests; fragments arrive only when user taps load
- Bubble sends IR1 with missing indices only if partial session exists
  (partial resume: only missing fragments requested, not the whole image)
- 30s timeout resets the loading spinner so user can tap retry again
- Saves LoRa airtime by never transmitting IR1 without explicit user action

.github/workflows/build-artifacts.yml

@@ -8,6 +8,8 @@ on:
 
 permissions:
   contents: write
+  pages: write
+  id-token: write
 
 env:
   FLUTTER_VERSION: "3.35.6"
@@ -256,6 +258,49 @@ jobs:
             ${{ env.IOS_RUNNER_ZIP }}
           if-no-files-found: error
 
+  build-web:
+    name: Build Web App
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          flutter-version: ${{ env.FLUTTER_VERSION }}
+          channel: stable
+          cache: true
+
+      - name: Enable web
+        run: flutter config --enable-web
+
+      - name: Install dependencies
+        run: flutter pub get
+
+      - name: Build web release
+        run: flutter build web --release --base-href /meshcore_sar_app/
+
+      - name: Upload pages artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: build/web
+
+  deploy-pages:
+    name: Deploy to GitHub Pages
+    runs-on: ubuntu-latest
+    needs: build-web
+    if: github.ref == 'refs/heads/main'
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
+
   upload-release-assets:
     name: Upload Assets To Release
     if: github.event_name == 'release'

Makefile

@@ -34,8 +34,9 @@ DAILY_BUILD := $(shell \
 # Version format: YYYY.MMDD.DAILY+BUILD
 # DAILY resets each day (for readability), BUILD always increments (for Android)
 NEW_VERSION := $(YEAR).$(MMDD).$(DAILY_BUILD)+$(NEW_BUILD_NUMBER)
+NEW_BUILD_NAME := $(shell echo $(NEW_VERSION) | cut -d'+' -f1)
 
-.PHONY: help version bump build release release-android release-ios clean deps analyze test icon bundle bundle-no-bump
+.PHONY: help version bump make-bump sync-ios-version build release release-android release-ios clean deps analyze test icon bundle bundle-no-bump
 
 help: ## Show this help
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-15s\033[0m %s\n", $$1, $$2}'
@@ -49,8 +50,19 @@ version: ## Show current and next version
 bump: ## Bump version in pubspec.yaml
 	@echo "Bumping version to $(NEW_VERSION)..."
 	@sed -i '' 's/^version: .*/version: $(NEW_VERSION)/' $(PUBSPEC)
+	@$(MAKE) sync-ios-version BUILD_NAME=$(NEW_BUILD_NAME) BUILD_NUMBER=$(NEW_BUILD_NUMBER)
 	@echo "Version bumped to $(NEW_VERSION)"
 
+make-bump: bump ## Alias for bump
+
+sync-ios-version: ## Sync iOS FLUTTER_BUILD_NAME/NUMBER from pubspec or provided BUILD_NAME/BUILD_NUMBER
+	@$(eval IOS_VERSION := $(shell grep '^version:' $(PUBSPEC) | sed 's/version: //'))
+	@$(eval IOS_BUILD_NAME := $(if $(BUILD_NAME),$(BUILD_NAME),$(shell echo $(IOS_VERSION) | cut -d'+' -f1)))
+	@$(eval IOS_BUILD_NUMBER := $(if $(BUILD_NUMBER),$(BUILD_NUMBER),$(shell echo $(IOS_VERSION) | cut -d'+' -f2)))
+	@echo "Syncing iOS version to $(IOS_BUILD_NAME)+$(IOS_BUILD_NUMBER)..."
+	@flutter build ios --config-only --build-name "$(IOS_BUILD_NAME)" --build-number "$(IOS_BUILD_NUMBER)" > /dev/null
+	@echo "iOS version synced"
+
 deps: ## Install dependencies
 	flutter pub get
 
@@ -115,6 +127,7 @@ release-android: build ## Build APK and create GitHub release (Android only)
 
 release-ios: ## Build iOS and upload to TestFlight
 	@echo "Building iOS and uploading to TestFlight..."
+	@$(MAKE) sync-ios-version
 	cd ios && fastlane release
 	@echo "iOS release uploaded!"
 

README.md

@@ -15,13 +15,19 @@
 </p>
 
 MeshCore SAR helps teams coordinate in low-connectivity or no-connectivity environments with messaging, voice, images, maps, and live location context in one app.
+It uses the MeshCore protocol over LoRa for long-range, infrastructure-free communication.
+`iOS TestFlight:` https://testflight.apple.com/join/HhzerdHp
 
 ## Highlights
 
-- Fast mesh messaging for direct and group coordination
-- On-demand voice and image transfer optimized for constrained links
-- Offline-first mapping with tactical overlays and SAR markers
-- Live team tracking, trails, and shareable map drawings
+- Rapid mesh chat for both 1:1 and group coordination
+- On-demand voice (Codec2) and image (AVIF) transfer tuned for low-bandwidth links
+- Offline-first mapping with tactical overlays and SAR incident markers
+- Live team location, movement trails, and shareable tactical drawings
+
+## Demo Video
+
+[<img width="1280" height="720" alt="MeshCore SAR demo preview" src="https://github.com/user-attachments/assets/13ccacee-7306-4976-a408-f31f3336828a" />](https://youtu.be/rLsKeLJBpFg)
 
 ## Screenshots
 
@@ -38,8 +44,8 @@ MeshCore SAR helps teams coordinate in low-connectivity or no-connectivity envir
 | Area | What you get |
 |---|---|
 | Messaging | Direct and group chat over mesh, with contact/room awareness from live telemetry |
-| Voice | Push-to-talk voice clips, fetched on demand when play is pressed, auto-play on completion |
-| Images | Camera/gallery image sending, auto-compression, tap-to-load receiving, full-screen viewer |
+| Voice | Push-to-talk voice clips (Codec2), fetched on demand when play is pressed, auto-play on completion |
+| Images | Camera/gallery image sending (AVIF), auto-compression, tap-to-load receiving, full-screen viewer |
 | Maps | Street/topo/satellite/terrain layers, offline tile downloads, optional MBTiles import |
 | SAR Operations | Team markers with freshness indicators, SAR markers for incidents and staging points |
 | Tracking | Continuous GPS updates, personal trails, distance/duration trail stats |

ios/Runner.xcodeproj/project.pbxproj

@@ -489,7 +489,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 68;
+				CURRENT_PROJECT_VERSION = 74;
 				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 = 68;
+				CURRENT_PROJECT_VERSION = 74;
 				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 = 68;
+				CURRENT_PROJECT_VERSION = 74;
 				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 = 68;
+				CURRENT_PROJECT_VERSION = 74;
 				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 = 68;
+				CURRENT_PROJECT_VERSION = 74;
 				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 = 68;
+				CURRENT_PROJECT_VERSION = 74;
 				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>68</string>
+	<string>74</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSBluetoothAlwaysUsageDescription</key>
@@ -68,8 +68,12 @@
 	<string>MeshCore SAR needs access to the compass to show your heading direction on the map</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>MeshCore SAR needs microphone access to send voice messages over the mesh radio network during SAR operations</string>
+	<key>NSCameraUsageDescription</key>
+	<string>MeshCore SAR needs camera access to take photos and attach them to SAR messages</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>MeshCore SAR may need access to your photo library to attach images to messages or save map screenshots for documentation during SAR operations</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>MeshCore SAR needs permission to save exported screenshots and SAR documentation images to your photo library</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>

ios/fastlane/report.xml

@@ -5,22 +5,22 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000238">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.000195">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: increment_build_number" time="0.34961">
+      <testcase classname="fastlane.lanes" name="1: increment_build_number" time="0.405396">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: build_app" time="83.968525">
+      <testcase classname="fastlane.lanes" name="2: build_app" time="101.387002">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: upload_to_app_store" time="186.029813">
+      <testcase classname="fastlane.lanes" name="3: upload_to_app_store" time="209.873722">
         
       </testcase>
     

lib/l10n/app_localizations.dart

@@ -13,6 +13,7 @@ import 'app_localizations_fr.dart';
 import 'app_localizations_hr.dart';
 import 'app_localizations_it.dart';
 import 'app_localizations_sl.dart';
+import 'app_localizations_zh.dart';
 
 // ignore_for_file: type=lint
 
@@ -108,6 +109,7 @@ abstract class AppLocalizations {
     Locale('hr'),
     Locale('it'),
     Locale('sl'),
+    Locale('zh'),
   ];
 
   /// The application title
@@ -4225,6 +4227,7 @@ class _AppLocalizationsDelegate
     'hr',
     'it',
     'sl',
+    'zh',
   ].contains(locale.languageCode);
 
   @override
@@ -4250,6 +4253,8 @@ AppLocalizations lookupAppLocalizations(Locale locale) {
       return AppLocalizationsIt();
     case 'sl':
       return AppLocalizationsSl();
+    case 'zh':
+      return AppLocalizationsZh();
   }
 
   throw FlutterError(

lib/models/device_info.dart

@@ -17,8 +17,8 @@ enum ConnectionMode {
   /// Act as SSE server - share BLE device with multiple clients
   sseServer,
 
-  /// Connect to remote SSE server - no direct BLE connection
-  sseClient,
+  /// Direct TCP/WiFi connection to MeshCore device (port 5000)
+  tcp,
 }
 
 extension ConnectionModeExtension on ConnectionMode {
@@ -28,8 +28,8 @@ extension ConnectionModeExtension on ConnectionMode {
         return 'Direct (BLE)';
       case ConnectionMode.sseServer:
         return 'Share Device (Server)';
-      case ConnectionMode.sseClient:
-        return 'Connect to Server';
+      case ConnectionMode.tcp:
+        return 'Direct (WiFi)';
     }
   }
 
@@ -39,8 +39,8 @@ extension ConnectionModeExtension on ConnectionMode {
         return 'Direct BLE connection to MeshCore device';
       case ConnectionMode.sseServer:
         return 'Share BLE device with multiple clients over network';
-      case ConnectionMode.sseClient:
-        return 'Connect to remote server without BLE';
+      case ConnectionMode.tcp:
+        return 'Direct WiFi/TCP connection to MeshCore device';
     }
   }
 }

lib/providers/app_provider.dart

@@ -10,14 +10,17 @@ import 'voice_provider.dart';
 import 'image_provider.dart' as ip;
 import '../services/tile_cache_service.dart';
 import '../services/location_tracking_service.dart';
+import '../services/packet_capture_storage_service.dart';
 import '../models/contact.dart';
 import '../models/message.dart';
+import '../models/ble_packet_log.dart';
 import '../utils/drawing_message_parser.dart';
 import '../utils/voice_message_parser.dart';
 import '../utils/image_message_parser.dart';
 
 /// Main App Provider - coordinates all other providers
 class AppProvider with ChangeNotifier {
+  static const int _maxDirectPayloadHops = 3;
   final ConnectionProvider connectionProvider;
   final ContactsProvider contactsProvider;
   final MessagesProvider messagesProvider;
@@ -28,6 +31,8 @@ class AppProvider with ChangeNotifier {
   final TileCacheService tileCacheService;
   final LocationTrackingService locationTrackingService =
       LocationTrackingService();
+  final PacketCaptureStorageService packetCaptureStorageService =
+      PacketCaptureStorageService();
 
   bool _isInitialized = false;
   bool get isInitialized => _isInitialized;
@@ -46,15 +51,17 @@ class AppProvider with ChangeNotifier {
   bool get isVoiceCompressorEnabled => _isVoiceCompressorEnabled;
   bool _isVoiceLimiterEnabled = true;
   bool get isVoiceLimiterEnabled => _isVoiceLimiterEnabled;
+  bool _autoAddDiscoveredContacts = false;
+  bool get autoAddDiscoveredContacts => _autoAddDiscoveredContacts;
 
   static const Duration _packetRetryDelay = Duration(milliseconds: 1200);
   static const int _maxPacketRetryAttempts = 4;
   final Map<String, String> _voiceSessionSenderKey6 = {};
-  final Map<String, String> _imageSessionSenderKey6 = {};
   final Map<String, Timer> _voiceMissingRetryTimers = {};
-  final Map<String, Timer> _imageMissingRetryTimers = {};
   final Map<String, int> _voiceMissingRetryAttempts = {};
-  final Map<String, int> _imageMissingRetryAttempts = {};
+  Timer? _packetCaptureFlushTimer;
+  String? _lastPersistedPacketSignature;
+  bool _isPersistingPacketCapture = false;
 
   AppProvider({
     required this.connectionProvider,
@@ -75,10 +82,70 @@ class AppProvider with ChangeNotifier {
     _loadVoiceBandPassFilterEnabled();
     _loadVoiceCompressorEnabled();
     _loadVoiceLimiterEnabled();
+    _loadAutoAddDiscoveredContacts();
+    _startPacketCapturePersistence();
     _syncDrawingsOnStartup(); // Sync drawings immediately after providers load
     _isInitialized = true;
   }
 
+  void _startPacketCapturePersistence() {
+    _packetCaptureFlushTimer?.cancel();
+    _packetCaptureFlushTimer = Timer.periodic(const Duration(seconds: 2), (_) {
+      unawaited(_flushPacketCaptureLogs());
+    });
+    unawaited(_flushPacketCaptureLogs());
+  }
+
+  String _packetLogSignature(BlePacketLog log) {
+    final prefix = log.rawData.length <= 12
+        ? log.rawData
+        : log.rawData.sublist(0, 12);
+    final prefixHex = prefix
+        .map((b) => b.toRadixString(16).padLeft(2, '0'))
+        .join();
+    return '${log.timestamp.microsecondsSinceEpoch}|'
+        '${log.direction.name}|${log.responseCode ?? -1}|'
+        '${log.rawData.length}|$prefixHex';
+  }
+
+  Future<void> _flushPacketCaptureLogs() async {
+    if (_isPersistingPacketCapture) return;
+    _isPersistingPacketCapture = true;
+    try {
+      final logs = connectionProvider.bleService.packetLogs;
+      if (logs.isEmpty) return;
+
+      List<BlePacketLog> toPersist = const [];
+      if (_lastPersistedPacketSignature == null) {
+        toPersist = logs;
+      } else {
+        final lastSig = _lastPersistedPacketSignature!;
+        var lastIndex = -1;
+        for (var i = logs.length - 1; i >= 0; i--) {
+          if (_packetLogSignature(logs[i]) == lastSig) {
+            lastIndex = i;
+            break;
+          }
+        }
+        if (lastIndex == -1) {
+          // In-memory log rotated or cleared; persist current window to avoid gaps.
+          toPersist = logs;
+        } else if (lastIndex < logs.length - 1) {
+          toPersist = logs.sublist(lastIndex + 1);
+        }
+      }
+
+      if (toPersist.isNotEmpty) {
+        await packetCaptureStorageService.appendLogs(toPersist);
+      }
+      _lastPersistedPacketSignature = _packetLogSignature(logs.last);
+    } catch (e) {
+      debugPrint('❌ [AppProvider] Packet capture flush failed: $e');
+    } finally {
+      _isPersistingPacketCapture = false;
+    }
+  }
+
   /// Sync drawings from messages on app startup (before BLE connection)
   Future<void> _syncDrawingsOnStartup() async {
     // Wait for MessagesProvider to finish initializing
@@ -239,6 +306,30 @@ class AppProvider with ChangeNotifier {
     }
   }
 
+  /// Load auto-add discovered contacts setting from shared preferences.
+  Future<void> _loadAutoAddDiscoveredContacts() async {
+    try {
+      final prefs = await SharedPreferences.getInstance();
+      _autoAddDiscoveredContacts =
+          prefs.getBool('auto_add_discovered_contacts') ?? false;
+      notifyListeners();
+    } catch (e) {
+      debugPrint('Error loading auto-add discovered contacts setting: $e');
+    }
+  }
+
+  /// Toggle auto-add discovered contacts on/off.
+  Future<void> toggleAutoAddDiscoveredContacts(bool enabled) async {
+    try {
+      _autoAddDiscoveredContacts = enabled;
+      final prefs = await SharedPreferences.getInstance();
+      await prefs.setBool('auto_add_discovered_contacts', enabled);
+      notifyListeners();
+    } catch (e) {
+      debugPrint('Error saving auto-add discovered contacts setting: $e');
+    }
+  }
+
   /// Initialize tile cache service
   Future<void> _initializeTileCache() async {
     try {
@@ -475,6 +566,22 @@ class AppProvider with ChangeNotifier {
           debugPrint(
             '⚠️ [AppProvider] Voice fetch requester contact not found',
           );
+          messagesProvider.logSystemMessage(
+            text:
+                'Cannot fetch voice: requester contact is unknown. Add/sync contacts first.',
+            level: 'warning',
+          );
+          return;
+        }
+        if (requester.outPathLen > _maxDirectPayloadHops) {
+          debugPrint(
+            '⚠️ [AppProvider] Voice fetch requester too far: ${requester.outPathLen} hops',
+          );
+          messagesProvider.logSystemMessage(
+            text:
+                'Cannot fetch voice for ${requester.advName}: message is too far (${requester.outPathLen} hops, max $_maxDirectPayloadHops).',
+            level: 'warning',
+          );
           return;
         }
         unawaited(
@@ -575,6 +682,17 @@ class AppProvider with ChangeNotifier {
               senderPrefix,
             );
             if (requester != null) {
+              if (requester.outPathLen > _maxDirectPayloadHops) {
+                debugPrint(
+                  '⚠️ [AppProvider] Image fetch requester too far: ${requester.outPathLen} hops',
+                );
+                messagesProvider.logSystemMessage(
+                  text:
+                      'Cannot fetch image for ${requester.advName}: message is too far (${requester.outPathLen} hops, max $_maxDirectPayloadHops).',
+                  level: 'warning',
+                );
+                return;
+              }
               unawaited(
                 imageProvider.serveSessionTo(
                   sessionId: imageFetchRequest.sessionId,
@@ -584,6 +702,15 @@ class AppProvider with ChangeNotifier {
                       : null,
                 ),
               );
+            } else {
+              debugPrint(
+                '⚠️ [AppProvider] Image fetch requester contact not found',
+              );
+              messagesProvider.logSystemMessage(
+                text:
+                    'Cannot fetch image: requester contact is unknown. Add/sync contacts first.',
+                level: 'warning',
+              );
             }
           }
         }
@@ -593,9 +720,6 @@ class AppProvider with ChangeNotifier {
       // Image envelope (IE1): announce image availability.
       final imageEnvelope = ImageEnvelope.tryParse(enrichedMessage.text);
       if (imageEnvelope != null) {
-        _imageSessionSenderKey6[imageEnvelope.sessionId] = imageEnvelope
-            .senderKey6
-            .toLowerCase();
         imageProvider.registerEnvelope(imageEnvelope);
         messagesProvider.addMessage(
           enrichedMessage,
@@ -683,12 +807,11 @@ class AppProvider with ChangeNotifier {
         if (frag == null) return;
         debugPrint('📷 [AppProvider] Binary image fragment received: $frag');
         final session = imageProvider.session(frag.sessionId);
-        final justComplete = imageProvider.addFragment(
+        imageProvider.addFragment(
           frag,
           width: session?.width ?? 0,
           height: session?.height ?? 0,
         );
-        _scheduleImageMissingRetry(frag.sessionId, justComplete: justComplete);
         return;
       }
 
@@ -737,13 +860,22 @@ class AppProvider with ChangeNotifier {
           }
         });
       } else {
-        contactsProvider.addPendingAdvert(
-          publicKey,
-          devicePublicKey: connectionProvider.deviceInfo.publicKey,
-        );
-        debugPrint(
-          '   Unknown contact - added to pending adverts list and waiting for details',
-        );
+        if (_autoAddDiscoveredContacts) {
+          debugPrint('   Unknown contact - auto-add enabled, fetching details');
+          Future.delayed(const Duration(milliseconds: 100), () {
+            if (connectionProvider.deviceInfo.isConnected) {
+              connectionProvider.getContact(publicKey);
+            }
+          });
+        } else {
+          contactsProvider.addPendingAdvert(
+            publicKey,
+            devicePublicKey: connectionProvider.deviceInfo.publicKey,
+          );
+          debugPrint(
+            '   Unknown contact - added to pending adverts list and waiting for details',
+          );
+        }
       }
     };
 
@@ -1094,79 +1226,6 @@ class AppProvider with ChangeNotifier {
     });
   }
 
-  void _scheduleImageMissingRetry(
-    String sessionId, {
-    required bool justComplete,
-  }) {
-    if (justComplete || imageProvider.isComplete(sessionId)) {
-      _imageMissingRetryTimers.remove(sessionId)?.cancel();
-      _imageMissingRetryAttempts.remove(sessionId);
-      return;
-    }
-
-    _imageMissingRetryAttempts[sessionId] = 0;
-    _imageMissingRetryTimers[sessionId]?.cancel();
-    _imageMissingRetryTimers[sessionId] = Timer(_packetRetryDelay, () {
-      unawaited(_requestMissingImageFragments(sessionId));
-    });
-  }
-
-  Future<void> _requestMissingImageFragments(String sessionId) async {
-    if (imageProvider.isComplete(sessionId)) {
-      _imageMissingRetryTimers.remove(sessionId)?.cancel();
-      _imageMissingRetryAttempts.remove(sessionId);
-      return;
-    }
-
-    final attempt = _imageMissingRetryAttempts[sessionId] ?? 0;
-    if (attempt >= _maxPacketRetryAttempts) {
-      debugPrint(
-        '⚠️ [AppProvider] Image re-request limit reached for $sessionId',
-      );
-      _imageMissingRetryTimers.remove(sessionId)?.cancel();
-      return;
-    }
-
-    final senderKey6 = _imageSessionSenderKey6[sessionId];
-    if (senderKey6 == null) return;
-    final sender = _resolveContactByPrefixHex(senderKey6);
-    final deviceKey = connectionProvider.deviceInfo.publicKey;
-    if (sender == null || deviceKey == null || deviceKey.length < 6) return;
-
-    final missing = imageProvider.missingFragmentIndices(sessionId);
-    if (missing.isEmpty) {
-      _imageMissingRetryTimers.remove(sessionId)?.cancel();
-      _imageMissingRetryAttempts.remove(sessionId);
-      return;
-    }
-
-    final requesterKey6 = deviceKey
-        .sublist(0, 6)
-        .map((b) => b.toRadixString(16).padLeft(2, '0'))
-        .join('');
-
-    final request = ImageFetchRequest(
-      sessionId: sessionId,
-      want: 'missing',
-      missingIndices: missing,
-      requesterKey6: requesterKey6,
-      timestampSec: DateTime.now().millisecondsSinceEpoch ~/ 1000,
-    );
-
-    final sent = await connectionProvider.sendTextMessage(
-      contactPublicKey: sender.publicKey,
-      text: request.encode(),
-      contact: sender,
-    );
-    if (!sent) return;
-
-    _imageMissingRetryAttempts[sessionId] = attempt + 1;
-    _imageMissingRetryTimers[sessionId]?.cancel();
-    _imageMissingRetryTimers[sessionId] = Timer(_packetRetryDelay, () {
-      unawaited(_requestMissingImageFragments(sessionId));
-    });
-  }
-
   /// Insert or update a voice placeholder message for binary raw-data packets.
   ///
   /// Binary voice packets arrive without a chat message, so we synthesise one
@@ -1300,15 +1359,9 @@ class AppProvider with ChangeNotifier {
     for (final timer in _voiceMissingRetryTimers.values) {
       timer.cancel();
     }
-    for (final timer in _imageMissingRetryTimers.values) {
-      timer.cancel();
-    }
     _voiceMissingRetryTimers.clear();
-    _imageMissingRetryTimers.clear();
     _voiceMissingRetryAttempts.clear();
-    _imageMissingRetryAttempts.clear();
     _voiceSessionSenderKey6.clear();
-    _imageSessionSenderKey6.clear();
     notifyListeners();
   }
 
@@ -1328,6 +1381,8 @@ class AppProvider with ChangeNotifier {
 
   @override
   void dispose() {
+    _packetCaptureFlushTimer?.cancel();
+    unawaited(_flushPacketCaptureLogs());
     // Remove connection state listener
     connectionProvider.removeListener(_handleConnectionStateChange);
     // Clear location service callbacks
@@ -1340,9 +1395,6 @@ class AppProvider with ChangeNotifier {
     for (final timer in _voiceMissingRetryTimers.values) {
       timer.cancel();
     }
-    for (final timer in _imageMissingRetryTimers.values) {
-      timer.cancel();
-    }
     super.dispose();
   }
 }

lib/providers/image_provider.dart

@@ -36,6 +36,7 @@ class ImageSession {
 class ImageProvider with ChangeNotifier {
   static const String _storageKey = 'stored_image_sessions_v1';
   static const Duration _outgoingTtl = Duration(minutes: 15);
+  static const int maxDirectPayloadHops = 3;
 
   /// Incoming sessions keyed by sessionId.
   final Map<String, ImageSession> _sessions = {};
@@ -190,6 +191,12 @@ class ImageProvider with ChangeNotifier {
       debugPrint('⚠️ [ImageProvider] ${requester.advName} has no direct path');
       return false;
     }
+    if (requester.outPathLen > maxDirectPayloadHops) {
+      debugPrint(
+        '⚠️ [ImageProvider] ${requester.advName} is too far: ${requester.outPathLen} hops (max $maxDirectPayloadHops)',
+      );
+      return false;
+    }
 
     for (final fragment in cached.fragments) {
       if (requestedIndices != null &&

lib/providers/voice_provider.dart

@@ -36,6 +36,7 @@ class VoiceSession {
 /// Manages incoming voice packet sessions and coordinates playback.
 class VoiceProvider with ChangeNotifier {
   static const String _voiceSessionsStorageKey = 'stored_voice_sessions_v1';
+  static const int maxDirectPayloadHops = 3;
   final VoiceCodecService _codec;
   final VoicePlayerService _player;
   late final StreamSubscription<void> _playerEventsSub;
@@ -161,6 +162,12 @@ class VoiceProvider with ChangeNotifier {
       );
       return false;
     }
+    if (requester.outPathLen > maxDirectPayloadHops) {
+      debugPrint(
+        '⚠️ [VoiceProvider] Requester ${requester.advName} is too far: ${requester.outPathLen} hops (max $maxDirectPayloadHops)',
+      );
+      return false;
+    }
 
     for (final packet in cached.packets) {
       if (requestedIndices != null &&

lib/screens/home_screen.dart

@@ -6,6 +6,7 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:vibration/vibration.dart';
 import '../providers/connection_provider.dart';
 import '../providers/app_provider.dart';
+import '../models/device_info.dart' show ConnectionMode;
 import '../providers/messages_provider.dart';
 import '../providers/contacts_provider.dart';
 import '../theme/app_theme.dart';
@@ -298,7 +299,7 @@ class _HomeScreenState extends State<HomeScreen>
                   builder: (context, provider, child) {
                     final isConnected =
                         provider.deviceInfo.isConnected ||
-                        provider.isSseClientConnected;
+                        provider.deviceInfo.isConnected;
                     if (isConnected) {
                       return IconButton(
                         onPressed: () async {
@@ -446,9 +447,9 @@ class _HomeScreenState extends State<HomeScreen>
     return Consumer<ConnectionProvider>(
       builder: (context, provider, child) {
         final deviceInfo = provider.deviceInfo;
-        final isBleConnected = deviceInfo.isConnected;
-        final isSseConnected = provider.isSseClientConnected;
-        final isConnected = isBleConnected || isSseConnected;
+        final isConnected = deviceInfo.isConnected;
+        final isTcpConnected = provider.connectionMode == ConnectionMode.tcp;
+        final isBleConnected = isConnected && !isTcpConnected;
 
         if (!isConnected) {
           // Disconnected state: show connect button
@@ -536,10 +537,10 @@ class _HomeScreenState extends State<HomeScreen>
                           mainAxisSize: MainAxisSize.min,
                           children: [
                             Icon(
-                              isSseConnected
+                              isTcpConnected
                                   ? Icons.wifi
                                   : Icons.bluetooth_connected,
-                              color: isSseConnected
+                              color: isTcpConnected
                                   ? Colors.green
                                   : (deviceInfo.signalRssi != null
                                         ? BatteryDisplayHelper.getSignalColor(
@@ -561,10 +562,10 @@ class _HomeScreenState extends State<HomeScreen>
                                 ),
                               ),
                             ],
-                            if (isSseConnected && !isBleConnected) ...[
+                            if (isTcpConnected) ...[
                               const SizedBox(width: 3),
                               Text(
-                                'SSE',
+                                'WiFi',
                                 style: const TextStyle(
                                   fontSize: 11,
                                   color: Colors.green,

lib/screens/messages_tab.dart

@@ -1,5 +1,6 @@
 import 'dart:async';
 import 'dart:io' show Platform;
+import 'package:flutter/foundation.dart' show kIsWeb;
 import 'dart:math' as math;
 import 'dart:typed_data';
 import 'package:flutter/material.dart';
@@ -67,7 +68,7 @@ class _MessagesTabState extends State<MessagesTab> {
   static const double _silenceRmsThreshold = 500.0;
   static const double _silencePeakThreshold = 1400.0;
   static const int _maxInteriorSilentChunks = 2;
-  bool get _voiceSupported => Platform.isIOS || Platform.isAndroid;
+  bool get _voiceSupported => !kIsWeb && (Platform.isIOS || Platform.isAndroid);
   StreamSubscription<Int16List>? _voiceStreamSub;
   String? _currentVoiceSessionId;
   final List<Int16List> _recordedChunks = [];
@@ -433,6 +434,9 @@ class _MessagesTabState extends State<MessagesTab> {
     ImageSource source = ImageSource.gallery,
   }) async {
     if (_isSendingImage) return;
+    final shouldContinue = await _confirmPublicChannelMediaSend('image');
+    if (!shouldContinue) return;
+    if (!mounted) return;
     final connectionProvider = context.read<ConnectionProvider>();
     if (!connectionProvider.deviceInfo.isConnected) {
       ToastLogger.error(context, 'Not connected to device');
@@ -534,10 +538,14 @@ class _MessagesTabState extends State<MessagesTab> {
       final isChannel =
           _destinationType ==
           MessageDestinationPreferences.destinationTypeChannel;
+      final channelIdx = isChannel
+          ? (_selectedRecipient?.publicKey[1] ?? 0)
+          : null;
+      final recipient = _selectedRecipient;
       final placeholder = Message(
         id: msgId,
         messageType: isChannel ? MessageType.channel : MessageType.contact,
-        channelIdx: isChannel ? 0 : null,
+        channelIdx: channelIdx,
         senderPublicKeyPrefix: deviceKey.sublist(0, 6),
         pathLen: 0,
         textType: MessageTextType.plain,
@@ -545,30 +553,37 @@ class _MessagesTabState extends State<MessagesTab> {
         text: envelope.encode(),
         receivedAt: DateTime.now(),
         deliveryStatus: MessageDeliveryStatus.sending,
+        recipientPublicKey: isChannel ? null : recipient?.publicKey,
       );
       messagesProvider.addSentMessage(placeholder);
 
       // Send IE1 envelope via normal message path.
       final envelopeText = envelope.encode();
-      if (_destinationType ==
-          MessageDestinationPreferences.destinationTypeChannel) {
+
+      if (isChannel) {
         await connectionProvider.sendChannelMessage(
-          channelIdx: 0,
+          channelIdx: channelIdx ?? 0,
           text: envelopeText,
           messageId: msgId,
         );
-      } else if (_selectedRecipient != null) {
+      } else if (recipient != null) {
         final sent = await connectionProvider.sendTextMessage(
-          contactPublicKey: _selectedRecipient!.publicKey,
+          contactPublicKey: recipient.publicKey,
           text: envelopeText,
           messageId: msgId,
-          contact: _selectedRecipient!,
+          contact: recipient,
         );
         if (!sent) {
           messagesProvider.markMessageFailed(msgId);
           if (!mounted) return;
           ToastLogger.error(context, 'Failed to announce image');
+          return;
         }
+      } else {
+        messagesProvider.markMessageFailed(msgId);
+        if (!mounted) return;
+        ToastLogger.error(context, 'No recipient selected');
+        return;
       }
 
       debugPrint(
@@ -576,6 +591,22 @@ class _MessagesTabState extends State<MessagesTab> {
         '${fragments.length} fragments, ${compressed.length}B, '
         'chunk=${imageDataBytesPerFragment}B',
       );
+
+      // Push all fragments immediately for direct contacts.
+      // For channels, fragments are served on demand via IR1 fetch requests.
+      if (!isChannel && recipient != null) {
+        // Small delay so the IE1 envelope can propagate before fragments arrive.
+        await Future.delayed(const Duration(milliseconds: 500));
+        if (!mounted) return;
+        final served = await imageProvider.serveSessionTo(
+          sessionId: sessionId,
+          requester: recipient,
+        );
+        debugPrint(
+          '📷 [Image] Pushed ${served ? fragments.length : 0} '
+          'fragments to ${recipient.advName}',
+        );
+      }
     } catch (e, st) {
       debugPrint('❌ [Image] _pickAndSendImage: $e\n$st');
       if (!mounted) return;
@@ -712,6 +743,17 @@ class _MessagesTabState extends State<MessagesTab> {
       return;
     }
 
+    final shouldContinue = await _confirmPublicChannelMediaSend('voice');
+    if (!shouldContinue) {
+      if (mounted) {
+        setState(() {
+          _isSendingVoice = false;
+          _currentVoiceSessionId = null;
+        });
+      }
+      return;
+    }
+
     try {
       await _encodeAndSendAllPackets(
         chunks: chunks,
@@ -743,8 +785,6 @@ class _MessagesTabState extends State<MessagesTab> {
     final connectionProvider = context.read<ConnectionProvider>();
     final messagesProvider = context.read<MessagesProvider>();
     final voiceProvider = context.read<VoiceProvider>();
-
-    // Insert the chat placeholder before sending (so it appears immediately).
     final msgId = 'voice_${sessionId}_sent';
     final devicePublicKey = connectionProvider.deviceInfo.publicKey;
     final senderPublicKeyPrefix =
@@ -754,24 +794,8 @@ class _MessagesTabState extends State<MessagesTab> {
     final isChannel =
         _destinationType ==
         MessageDestinationPreferences.destinationTypeChannel;
-    final sentMsg = Message(
-      id: msgId,
-      messageType: (!isChannel && _selectedRecipient != null)
-          ? MessageType.contact
-          : MessageType.channel,
-      senderPublicKeyPrefix: senderPublicKeyPrefix,
-      pathLen: 0,
-      textType: MessageTextType.plain,
-      senderTimestamp: DateTime.now().millisecondsSinceEpoch ~/ 1000,
-      text: '',
-      receivedAt: DateTime.now(),
-      deliveryStatus: MessageDeliveryStatus.sent,
-      isVoice: true,
-      voiceId: sessionId,
-      channelIdx: isChannel ? (_selectedRecipient?.publicKey[1] ?? 0) : null,
-      recipientPublicKey: _selectedRecipient?.publicKey,
-    );
-    messagesProvider.addSentMessage(sentMsg);
+    final recipient = _selectedRecipient;
+    final channelIdx = isChannel ? (recipient?.publicKey[1] ?? 0) : null;
 
     final encodedPackets = <VoicePacket>[];
     debugPrint(
@@ -831,32 +855,49 @@ class _MessagesTabState extends State<MessagesTab> {
     );
     final envelopeText = envelope.encodeText();
 
+    // Insert placeholder with real VE1 envelope text so technical details are populated.
+    final sentMsg = Message(
+      id: msgId,
+      messageType: (!isChannel && recipient != null)
+          ? MessageType.contact
+          : MessageType.channel,
+      senderPublicKeyPrefix: senderPublicKeyPrefix,
+      pathLen: 0,
+      textType: MessageTextType.plain,
+      senderTimestamp: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+      text: envelopeText,
+      receivedAt: DateTime.now(),
+      deliveryStatus: MessageDeliveryStatus.sent,
+      isVoice: true,
+      voiceId: sessionId,
+      channelIdx: channelIdx,
+      recipientPublicKey: isChannel ? null : recipient?.publicKey,
+    );
+    messagesProvider.addSentMessage(sentMsg);
+
     try {
       if (isChannel) {
-        final channelIdx = _selectedRecipient?.publicKey[1] ?? 0;
         await connectionProvider.sendChannelMessage(
-          channelIdx: channelIdx,
+          channelIdx: channelIdx ?? 0,
           text: envelopeText,
           messageId: msgId,
         );
-      } else if (_selectedRecipient != null) {
+      } else if (recipient != null) {
         final sentSuccessfully = await connectionProvider.sendTextMessage(
-          contactPublicKey: _selectedRecipient!.publicKey,
+          contactPublicKey: recipient.publicKey,
           text: envelopeText,
           messageId: msgId,
-          contact: _selectedRecipient,
+          contact: recipient,
         );
         if (!sentSuccessfully) {
           messagesProvider.markMessageFailed(msgId);
           return;
         }
       } else {
-        // Fallback to public channel if destination cannot be resolved.
-        await connectionProvider.sendChannelMessage(
-          channelIdx: 0,
-          text: envelopeText,
-          messageId: msgId,
-        );
+        messagesProvider.markMessageFailed(msgId);
+        if (!mounted) return;
+        ToastLogger.error(context, 'No recipient selected');
+        return;
       }
     } catch (e, st) {
       debugPrint('❌ [Voice] envelope send error: $e\n$st');
@@ -913,6 +954,43 @@ class _MessagesTabState extends State<MessagesTab> {
     return rms < _silenceRmsThreshold && peak < _silencePeakThreshold;
   }
 
+  bool _isPublicChannelSelected() {
+    if (_destinationType !=
+        MessageDestinationPreferences.destinationTypeChannel) {
+      return false;
+    }
+    final channelIdx = _selectedRecipient?.publicKey[1] ?? 0;
+    return channelIdx == 0;
+  }
+
+  Future<bool> _confirmPublicChannelMediaSend(String mediaType) async {
+    if (!_isPublicChannelSelected() || !mounted) return true;
+
+    final decision = await showDialog<bool>(
+      context: context,
+      builder: (dialogContext) => AlertDialog(
+        title: const Text('Send to Public Channel?'),
+        content: Text(
+          'You are about to send $mediaType to the Public Channel. '
+          'This is not advised because everyone on the mesh may receive it. '
+          'Choose a private or tagged channel unless this is what you want.',
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(dialogContext).pop(false),
+            child: const Text('Cancel'),
+          ),
+          FilledButton(
+            onPressed: () => Navigator.of(dialogContext).pop(true),
+            child: const Text('Send anyway'),
+          ),
+        ],
+      ),
+    );
+
+    return decision ?? false;
+  }
+
   // ── SAR dialog ─────────────────────────────────────────────────────────────
 
   void _showSarDialog() {
@@ -1257,13 +1335,20 @@ class _MessagesTabState extends State<MessagesTab> {
 
     List<Message> filteredMessages;
 
-    // If public channel is selected, show ALL messages
+    // If channel destination is selected, filter by selected channel.
     if (_destinationType ==
-            MessageDestinationPreferences.destinationTypeChannel &&
-        _selectedRecipient == null) {
-      filteredMessages = allMessages;
+        MessageDestinationPreferences.destinationTypeChannel) {
+      final selectedChannelIdx = _selectedRecipient?.publicKey[1] ?? 0;
+      if (selectedChannelIdx == 0) {
+        // Public channel view keeps showing all messages (current app behavior).
+        filteredMessages = allMessages;
+      } else {
+        filteredMessages = allMessages
+            .where((message) => message.channelIdx == selectedChannelIdx)
+            .toList();
+      }
     }
-    // If a contact or room is selected, filter by recipient
+    // If a contact or room is selected, filter by recipient/sender prefixes.
     else if ((_destinationType ==
                 MessageDestinationPreferences.destinationTypeContact ||
             _destinationType ==

lib/screens/settings_screen.dart

@@ -661,6 +661,19 @@ class _SettingsScreenState extends State<SettingsScreen> {
               },
             ),
           ),
+          Consumer<AppProvider>(
+            builder: (context, appProvider, child) => SwitchListTile(
+              secondary: const Icon(Icons.person_add_alt_1),
+              title: const Text('Auto-add discovered contacts'),
+              subtitle: const Text(
+                'Automatically fetch and add new contacts when they are discovered',
+              ),
+              value: appProvider.autoAddDiscoveredContacts,
+              onChanged: (value) async {
+                await appProvider.toggleAutoAddDiscoveredContacts(value);
+              },
+            ),
+          ),
           Consumer<AppProvider>(
             builder: (context, appProvider, child) => SwitchListTile(
               secondary: const Icon(Icons.map_outlined),

lib/services/mesh_map_nodes_service.dart

@@ -0,0 +1,68 @@
+import 'dart:convert';
+import 'package:http/http.dart' as http;
+
+class MeshMapNode {
+  final int type;
+  final String name;
+  final String publicKey;
+  final double latitude;
+  final double longitude;
+  final int updatedAtMs;
+
+  const MeshMapNode({
+    required this.type,
+    required this.name,
+    required this.publicKey,
+    required this.latitude,
+    required this.longitude,
+    required this.updatedAtMs,
+  });
+
+  factory MeshMapNode.fromJson(Map<String, dynamic> json) {
+    return MeshMapNode(
+      type: (json['type'] as num?)?.toInt() ?? 0,
+      name: (json['name'] as String?)?.trim() ?? 'Unknown',
+      publicKey: ((json['public_key'] as String?) ?? '').toLowerCase(),
+      latitude: (json['latitude'] as num?)?.toDouble() ?? 0.0,
+      longitude: (json['longitude'] as num?)?.toDouble() ?? 0.0,
+      updatedAtMs: (json['updated_at'] as num?)?.toInt() ?? 0,
+    );
+  }
+}
+
+class MeshMapNodesService {
+  static const String _nodesEndpoint = 'https://api.meshcore.nz/api/v1/map/nodes';
+  static const Duration _cacheTtl = Duration(minutes: 2);
+  static List<MeshMapNode>? _cachedNodes;
+  static DateTime? _cachedAt;
+
+  static Future<List<MeshMapNode>> fetchNodes({bool forceRefresh = false}) async {
+    final now = DateTime.now();
+    if (!forceRefresh &&
+        _cachedNodes != null &&
+        _cachedAt != null &&
+        now.difference(_cachedAt!) < _cacheTtl) {
+      return _cachedNodes!;
+    }
+
+    final response = await http
+        .get(Uri.parse(_nodesEndpoint))
+        .timeout(const Duration(seconds: 12));
+    if (response.statusCode < 200 || response.statusCode >= 300) {
+      throw Exception('Map nodes API returned ${response.statusCode}');
+    }
+
+    final decoded = jsonDecode(response.body) as Map<String, dynamic>;
+    final nodesRaw = decoded['nodes'] as List<dynamic>? ?? const [];
+
+    final nodes = nodesRaw
+        .whereType<Map<String, dynamic>>()
+        .map(MeshMapNode.fromJson)
+        .where((n) => n.publicKey.isNotEmpty && n.latitude != 0 && n.longitude != 0)
+        .toList();
+
+    _cachedNodes = nodes;
+    _cachedAt = now;
+    return nodes;
+  }
+}

lib/services/network_scanner_service.dart

@@ -1,213 +1,155 @@
 import 'dart:async';
 import 'dart:io';
 import 'package:flutter/foundation.dart';
-import 'package:http/http.dart' as http;
 import 'package:nsd/nsd.dart';
 
-/// Discovered SSE server on the network
+/// Discovered MeshCore device on the network (TCP/WiFi)
 class DiscoveredServer {
   final String ipAddress;
   final int port;
-  final int responseTime; // in milliseconds
-  final String serverUrl;
+  final int responseTime; // milliseconds
 
-  DiscoveredServer({
+  const DiscoveredServer({
     required this.ipAddress,
     required this.port,
     required this.responseTime,
-  }) : serverUrl = 'http://$ipAddress:$port';
+  });
 
   @override
-  String toString() {
-    return 'DiscoveredServer($ipAddress:$port, ${responseTime}ms)';
-  }
+  String toString() => 'DiscoveredServer($ipAddress:$port, ${responseTime}ms)';
 
   @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-    return other is DiscoveredServer &&
-        other.ipAddress == ipAddress &&
-        other.port == port;
-  }
+  bool operator ==(Object other) =>
+      other is DiscoveredServer &&
+      other.ipAddress == ipAddress &&
+      other.port == port;
 
   @override
   int get hashCode => Object.hash(ipAddress, port);
 }
 
-/// Network Scanner Service
+/// Discovers MeshCore devices running the TCP/WiFi server (port 5000).
 ///
-/// Discovers SSE servers on the local network using Bonjour/mDNS.
-/// Falls back to port scanning (12929) if no services are discovered.
-/// Uses parallel scanning (20 IPs at once) for fast discovery.
+/// First tries mDNS/Bonjour (_meshcore._tcp), then falls back to a parallel
+/// TCP-connect port scan of the local /24 subnet.
 class NetworkScannerService {
-  static const int defaultPort = 12929;
-  static const String serviceType = '_meshcore-sse._tcp';
+  static const int defaultPort = 5000;
+  static const String serviceType = '_meshcore._tcp';
   static const int parallelScans = 20;
-  static const Duration scanTimeout = Duration(seconds: 2);
+  static const Duration connectTimeout = Duration(seconds: 2);
   static const Duration bonjourTimeout = Duration(seconds: 5);
 
   Discovery? _activeDiscovery;
 
-  /// Callback for when a server is discovered
   Function(DiscoveredServer)? onServerDiscovered;
-
-  /// Callback for scan progress updates
   Function(int scanned, int total)? onProgressUpdate;
 
   bool _isScanning = false;
   bool get isScanning => _isScanning;
 
-  /// Cached discovered servers from the last scan
   List<DiscoveredServer> _cachedServers = [];
   List<DiscoveredServer> get cachedServers => List.unmodifiable(_cachedServers);
-
-  /// Whether we have cached results from a previous scan
   bool get hasCachedResults => _cachedServers.isNotEmpty;
 
-  /// Get all local IP addresses
-  Future<Set<String>> _getLocalIpAddresses() async {
-    final Set<String> localIps = {};
+  // ── Helpers ────────────────────────────────────────────────────────────────
 
+  Future<Set<String>> _getLocalIpAddresses() async {
+    final ips = <String>{};
     try {
-      final interfaces = await NetworkInterface.list();
-      for (final interface in interfaces) {
-        for (final addr in interface.addresses) {
-          if (addr.type == InternetAddressType.IPv4) {
-            localIps.add(addr.address);
-          }
+      for (final iface in await NetworkInterface.list()) {
+        for (final addr in iface.addresses) {
+          if (addr.type == InternetAddressType.IPv4) ips.add(addr.address);
         }
       }
     } catch (e) {
       debugPrint('❌ [NetworkScanner] Error getting local IPs: $e');
     }
-
-    return localIps;
+    return ips;
   }
 
-  /// Get local network IP range to scan
   Future<List<String>> _getLocalNetworkRange() async {
-    final List<String> ips = [];
-
     try {
-      // Get all network interfaces
-      final interfaces = await NetworkInterface.list();
-
-      for (final interface in interfaces) {
-        for (final addr in interface.addresses) {
-          // Only scan IPv4 addresses that are not loopback
+      for (final iface in await NetworkInterface.list()) {
+        for (final addr in iface.addresses) {
           if (addr.type == InternetAddressType.IPv4 && !addr.isLoopback) {
-            final ip = addr.address;
-            final parts = ip.split('.');
-
+            final parts = addr.address.split('.');
             if (parts.length == 4) {
-              // Generate range for the same subnet (e.g., 192.168.1.1-254)
               final subnet = '${parts[0]}.${parts[1]}.${parts[2]}';
-
-              // Scan from .1 to .254 (skip .0 and .255)
-              for (int i = 1; i <= 254; i++) {
-                ips.add('$subnet.$i');
-              }
-
-              debugPrint('📡 [NetworkScanner] Will scan subnet: $subnet.0/24');
-              // Only scan first viable subnet
-              return ips;
+              debugPrint('📡 [NetworkScanner] Scanning subnet $subnet.0/24');
+              return [for (int i = 1; i <= 254; i++) '$subnet.$i'];
             }
           }
         }
       }
     } catch (e) {
-      debugPrint('❌ [NetworkScanner] Error getting network interfaces: $e');
+      debugPrint('❌ [NetworkScanner] Error getting network range: $e');
     }
-
-    return ips;
+    return [];
   }
 
-  /// Check if an IP has an SSE server running
-  Future<DiscoveredServer?> _checkServer(String ip, int port) async {
+  /// Try a raw TCP connect to check if the MeshCore TCP server is listening.
+  Future<DiscoveredServer?> _checkDevice(String ip, int port) async {
+    final sw = Stopwatch()..start();
+    Socket? socket;
     try {
-      final stopwatch = Stopwatch()..start();
-      final url = Uri.parse('http://$ip:$port/api/status');
-
-      final response = await http.get(url).timeout(scanTimeout);
-
-      stopwatch.stop();
-
-      if (response.statusCode == 200) {
-        debugPrint('✅ [NetworkScanner] Found server at $ip:$port (${stopwatch.elapsedMilliseconds}ms)');
-
-        return DiscoveredServer(
-          ipAddress: ip,
-          port: port,
-          responseTime: stopwatch.elapsedMilliseconds,
-        );
-      }
-    } on TimeoutException {
-      // Timeout - server not responding, ignore
+      socket = await Socket.connect(
+        ip,
+        port,
+        timeout: connectTimeout,
+      );
+      sw.stop();
+      debugPrint(
+          '✅ [NetworkScanner] Found device at $ip:$port (${sw.elapsedMilliseconds}ms)');
+      return DiscoveredServer(
+        ipAddress: ip,
+        port: port,
+        responseTime: sw.elapsedMilliseconds,
+      );
     } on SocketException {
-      // Connection refused - no server at this IP, ignore
+      // Connection refused or timed out — no device here
     } catch (e) {
-      // Other errors - ignore
-      debugPrint('⚠️ [NetworkScanner] Error checking $ip:$port - $e');
+      debugPrint('⚠️ [NetworkScanner] Error checking $ip:$port — $e');
+    } finally {
+      socket?.destroy();
     }
-
     return null;
   }
 
-  /// Discover servers using Bonjour/mDNS
-  Future<List<DiscoveredServer>> _discoverViaBonjourAsync({int? port}) async {
+  // ── mDNS discovery ─────────────────────────────────────────────────────────
+
+  Future<List<DiscoveredServer>> _discoverViaMdns({int? port}) async {
     final scanPort = port ?? defaultPort;
-    final List<DiscoveredServer> discoveredServers = [];
+    final found = <DiscoveredServer>[];
 
     try {
-      debugPrint('🔍 [NetworkScanner] Starting Bonjour discovery for $serviceType...');
-
-      // Get local IP addresses to filter out
+      debugPrint('🔍 [NetworkScanner] mDNS discovery for $serviceType...');
       final localIps = await _getLocalIpAddresses();
-      debugPrint('📍 [NetworkScanner] Local IPs: ${localIps.join(", ")}');
 
-      // Start discovery with IP lookup
       _activeDiscovery = await startDiscovery(
         serviceType,
         ipLookupType: IpLookupType.any,
       );
 
-      // Wait for discovery to find services
       await Future.delayed(bonjourTimeout);
 
-      // Process discovered services
-      final services = _activeDiscovery?.services ?? [];
-      debugPrint('📡 [NetworkScanner] Bonjour found ${services.length} services');
-
-      for (final service in services) {
-        if (service.addresses != null && service.addresses!.isNotEmpty) {
-          for (final address in service.addresses!) {
-            // Skip if this is a local IP address
-            if (localIps.contains(address.address)) {
-              debugPrint('⏭️ [NetworkScanner] Skipping local IP: ${address.address}');
-              continue;
-            }
-
-            // Verify service is actually reachable
-            final result = await _checkServer(
-              address.address,
-              service.port ?? scanPort,
-            );
-
-            if (result != null) {
-              discoveredServers.add(result);
-              onServerDiscovered?.call(result);
-            }
+      for (final service in _activeDiscovery?.services ?? []) {
+        for (final addr in service.addresses ?? []) {
+          if (localIps.contains(addr.address)) continue;
+          final result =
+              await _checkDevice(addr.address, service.port ?? scanPort);
+          if (result != null) {
+            found.add(result);
+            onServerDiscovered?.call(result);
           }
         }
       }
 
-      // Stop discovery
       await stopDiscovery(_activeDiscovery!);
       _activeDiscovery = null;
-
-      debugPrint('✅ [NetworkScanner] Bonjour discovery complete. Found ${discoveredServers.length} servers.');
+      debugPrint(
+          '✅ [NetworkScanner] mDNS done. Found ${found.length} devices.');
     } catch (e) {
-      debugPrint('⚠️ [NetworkScanner] Bonjour discovery failed: $e');
+      debugPrint('⚠️ [NetworkScanner] mDNS failed: $e');
       if (_activeDiscovery != null) {
         try {
           await stopDiscovery(_activeDiscovery!);
@@ -216,132 +158,70 @@ class NetworkScannerService {
       }
     }
 
-    return discoveredServers;
+    return found;
   }
 
-  /// Scan the local network for SSE servers
-  /// First tries Bonjour/mDNS, then falls back to port scanning if nothing found
-  Future<List<DiscoveredServer>> scan({int? port}) async {
-    if (_isScanning) {
-      debugPrint('⚠️ [NetworkScanner] Scan already in progress');
-      return [];
-    }
+  // ── Port scan fallback ─────────────────────────────────────────────────────
 
-    _isScanning = true;
+  Future<List<DiscoveredServer>> _scanByPort({int? port}) async {
     final scanPort = port ?? defaultPort;
-    List<DiscoveredServer> discoveredServers = [];
+    final found = <DiscoveredServer>[];
 
-    try {
-      // Try Bonjour/mDNS discovery first
-      discoveredServers = await _discoverViaBonjourAsync(port: scanPort);
+    final localIps = await _getLocalIpAddresses();
+    final ips = await _getLocalNetworkRange();
+    if (ips.isEmpty) return [];
 
-      // Fall back to port scanning if Bonjour found nothing
-      if (discoveredServers.isEmpty) {
-        debugPrint('🔍 [NetworkScanner] Bonjour found nothing, falling back to port scanning...');
-        discoveredServers = await _scanByPortAsync(port: scanPort);
+    debugPrint(
+        '🔍 [NetworkScanner] Port scan: ${ips.length} IPs, port $scanPort');
+
+    int scanned = 0;
+    for (int i = 0; i < ips.length; i += parallelScans) {
+      final batch = ips.skip(i).take(parallelScans).toList();
+      final results =
+          await Future.wait(batch.map((ip) => _checkDevice(ip, scanPort)));
+
+      for (final result in results) {
+        if (result != null && !localIps.contains(result.ipAddress)) {
+          found.add(result);
+          onServerDiscovered?.call(result);
+        }
       }
 
-      // Cache the results
-      _cachedServers = discoveredServers;
-    } catch (e) {
-      debugPrint('❌ [NetworkScanner] Scan error: $e');
+      scanned += batch.length;
+      onProgressUpdate?.call(scanned, ips.length);
+    }
+
+    return found;
+  }
+
+  // ── Public API ─────────────────────────────────────────────────────────────
+
+  /// Scan for MeshCore WiFi devices. Tries mDNS first, falls back to port scan.
+  Future<List<DiscoveredServer>> scan({int? port}) async {
+    if (_isScanning) return [];
+    _isScanning = true;
+
+    try {
+      var found = await _discoverViaMdns(port: port);
+      if (found.isEmpty) {
+        debugPrint(
+            '🔍 [NetworkScanner] mDNS found nothing, falling back to port scan');
+        found = await _scanByPort(port: port);
+      }
+      _cachedServers = found;
+      return found;
     } finally {
       _isScanning = false;
     }
-
-    return discoveredServers;
   }
 
-  /// Fallback port scanning method
-  Future<List<DiscoveredServer>> _scanByPortAsync({int? port}) async {
-    final scanPort = port ?? defaultPort;
-    final List<DiscoveredServer> discoveredServers = [];
-
-    try {
-      debugPrint('🔍 [NetworkScanner] Starting port scan on port $scanPort...');
-
-      // Get local IP addresses to filter out
-      final localIps = await _getLocalIpAddresses();
-      debugPrint('📍 [NetworkScanner] Local IPs: ${localIps.join(", ")}');
-
-      final ips = await _getLocalNetworkRange();
-
-      if (ips.isEmpty) {
-        debugPrint('⚠️ [NetworkScanner] No network interfaces found');
-        return [];
-      }
-
-      debugPrint('📊 [NetworkScanner] Scanning ${ips.length} IPs with $parallelScans parallel connections');
-
-      int scannedCount = 0;
-
-      // Scan in batches of 20 parallel connections
-      for (int i = 0; i < ips.length; i += parallelScans) {
-        final batch = ips.skip(i).take(parallelScans).toList();
-
-        // Scan batch in parallel
-        final futures = batch.map((ip) => _checkServer(ip, scanPort)).toList();
-        final results = await Future.wait(futures);
-
-        // Collect discovered servers (excluding local IPs)
-        for (int j = 0; j < results.length; j++) {
-          final result = results[j];
-          if (result != null) {
-            // Skip if this is a local IP address
-            if (localIps.contains(result.ipAddress)) {
-              debugPrint('⏭️ [NetworkScanner] Skipping local IP: ${result.ipAddress}');
-              continue;
-            }
-
-            discoveredServers.add(result);
-            onServerDiscovered?.call(result);
-          }
-        }
-
-        scannedCount += batch.length;
-        onProgressUpdate?.call(scannedCount, ips.length);
-      }
-
-      debugPrint('✅ [NetworkScanner] Port scan complete. Found ${discoveredServers.length} servers.');
-    } catch (e) {
-      debugPrint('❌ [NetworkScanner] Port scan error: $e');
-    }
-
-    return discoveredServers;
-  }
-
-  /// Clear cached results (useful for forcing a fresh scan)
-  void clearCache() {
-    _cachedServers = [];
-    debugPrint('🗑️ [NetworkScanner] Cache cleared');
-  }
-
-  /// Stop ongoing scan
-  void stopScan() {
-    if (_isScanning) {
-      debugPrint('🛑 [NetworkScanner] Stopping scan...');
-      _isScanning = false;
-    }
-  }
-
-  /// Verify that a previously discovered server is still available
-  /// Returns true if server is reachable, false otherwise
+  /// Verify a previously discovered device is still reachable.
   Future<bool> verifyServer(DiscoveredServer server) async {
-    try {
-      debugPrint('🔍 [NetworkScanner] Verifying server at ${server.ipAddress}:${server.port}...');
-
-      final result = await _checkServer(server.ipAddress, server.port);
-
-      if (result != null) {
-        debugPrint('✅ [NetworkScanner] Server verified at ${server.ipAddress}:${server.port}');
-        return true;
-      } else {
-        debugPrint('❌ [NetworkScanner] Server no longer available at ${server.ipAddress}:${server.port}');
-        return false;
-      }
-    } catch (e) {
-      debugPrint('❌ [NetworkScanner] Server verification failed: $e');
-      return false;
-    }
+    final result = await _checkDevice(server.ipAddress, server.port);
+    return result != null;
   }
+
+  void clearCache() => _cachedServers = [];
+
+  void stopScan() => _isScanning = false;
 }

lib/services/packet_capture_storage_service.dart

@@ -0,0 +1,146 @@
+import 'dart:convert';
+import 'dart:io';
+import 'package:flutter/foundation.dart';
+import 'package:path_provider/path_provider.dart';
+import '../models/ble_packet_log.dart';
+
+class StoredPacketCapture {
+  final DateTime timestamp;
+  final String direction;
+  final int? responseCode;
+  final String? description;
+  final String rawBase64;
+  final int rawSize;
+  final double? snrDb;
+  final int? rssiDbm;
+
+  const StoredPacketCapture({
+    required this.timestamp,
+    required this.direction,
+    required this.responseCode,
+    required this.description,
+    required this.rawBase64,
+    required this.rawSize,
+    required this.snrDb,
+    required this.rssiDbm,
+  });
+
+  Map<String, dynamic> toJson() {
+    return {
+      'ts': timestamp.millisecondsSinceEpoch,
+      'dir': direction,
+      'code': responseCode,
+      'desc': description,
+      'raw': rawBase64,
+      'size': rawSize,
+      'snr': snrDb,
+      'rssi': rssiDbm,
+    };
+  }
+
+  static StoredPacketCapture fromJson(Map<String, dynamic> json) {
+    return StoredPacketCapture(
+      timestamp: DateTime.fromMillisecondsSinceEpoch((json['ts'] as num).toInt()),
+      direction: (json['dir'] as String?) ?? 'rx',
+      responseCode: (json['code'] as num?)?.toInt(),
+      description: json['desc'] as String?,
+      rawBase64: (json['raw'] as String?) ?? '',
+      rawSize: (json['size'] as num?)?.toInt() ?? 0,
+      snrDb: (json['snr'] as num?)?.toDouble(),
+      rssiDbm: (json['rssi'] as num?)?.toInt(),
+    );
+  }
+}
+
+/// Durable storage for raw BLE packets so future features can consume
+/// historical packet bytes across app restarts.
+class PacketCaptureStorageService {
+  static const String _fileName = 'packet_captures.jsonl';
+  static const int _maxStoredPackets = 20000;
+
+  File? _file;
+
+  Future<File> _resolveFile() async {
+    if (_file != null) return _file!;
+    final dir = await getApplicationSupportDirectory();
+    final file = File('${dir.path}/$_fileName');
+    if (!await file.exists()) {
+      await file.create(recursive: true);
+    }
+    _file = file;
+    return file;
+  }
+
+  Future<void> appendLogs(List<BlePacketLog> logs) async {
+    if (logs.isEmpty) return;
+    try {
+      final file = await _resolveFile();
+      final sink = file.openWrite(mode: FileMode.append);
+      for (final log in logs) {
+        final row = StoredPacketCapture(
+          timestamp: log.timestamp,
+          direction: log.direction.name,
+          responseCode: log.responseCode,
+          description: log.description,
+          rawBase64: base64Encode(log.rawData),
+          rawSize: log.rawData.length,
+          snrDb: log.logRxDataInfo?.snrDb,
+          rssiDbm: log.logRxDataInfo?.rssiDbm,
+        );
+        sink.writeln(jsonEncode(row.toJson()));
+      }
+      await sink.flush();
+      await sink.close();
+      await _pruneIfNeeded(file);
+    } catch (e) {
+      debugPrint('❌ [PacketCaptureStorage] Failed to append logs: $e');
+    }
+  }
+
+  Future<List<StoredPacketCapture>> loadRecent({int limit = 500}) async {
+    try {
+      final file = await _resolveFile();
+      if (!await file.exists()) return const [];
+      final lines = await file.readAsLines();
+      if (lines.isEmpty) return const [];
+      final start = lines.length > limit ? lines.length - limit : 0;
+      return lines
+          .sublist(start)
+          .where((l) => l.trim().isNotEmpty)
+          .map((l) => StoredPacketCapture.fromJson(jsonDecode(l) as Map<String, dynamic>))
+          .toList();
+    } catch (e) {
+      debugPrint('❌ [PacketCaptureStorage] Failed to load recent logs: $e');
+      return const [];
+    }
+  }
+
+  Future<int> count() async {
+    try {
+      final file = await _resolveFile();
+      if (!await file.exists()) return 0;
+      final lines = await file.readAsLines();
+      return lines.where((l) => l.trim().isNotEmpty).length;
+    } catch (_) {
+      return 0;
+    }
+  }
+
+  Future<void> clear() async {
+    try {
+      final file = await _resolveFile();
+      if (await file.exists()) {
+        await file.writeAsString('');
+      }
+    } catch (e) {
+      debugPrint('❌ [PacketCaptureStorage] Failed to clear logs: $e');
+    }
+  }
+
+  Future<void> _pruneIfNeeded(File file) async {
+    final lines = await file.readAsLines();
+    if (lines.length <= _maxStoredPackets) return;
+    final keep = lines.sublist(lines.length - _maxStoredPackets);
+    await file.writeAsString('${keep.join('\n')}\n');
+  }
+}

lib/services/sse_client_service.dart

@@ -1,667 +0,0 @@
-import 'dart:async';
-import 'dart:convert';
-import 'dart:io' as io;
-import 'package:flutter/foundation.dart';
-import 'package:http/http.dart' as http;
-import 'package:http/io_client.dart' as io_client;
-import '../models/message.dart';
-import '../models/contact.dart';
-import 'package:latlong2/latlong.dart';
-
-/// SSE Client Service
-///
-/// Connects to a remote SSE server to receive messages and contacts in real-time.
-/// This enables multiple app instances to share a single MeshCore BLE device
-/// without direct BLE connections.
-class SseClientService {
-  String? _serverUrl;
-  String? _authToken;
-  http.Client? _httpClient;
-  StreamSubscription? _messageSubscription;
-  StreamSubscription? _contactSubscription;
-  bool _isConnected = false;
-  bool _isConnecting = false;
-  bool _hasConnectedBefore =
-      false; // Track if we've ever successfully connected
-  Timer? _reconnectTimer;
-  Timer? _heartbeatTimer;
-  int _reconnectAttempts = 0;
-  static const int _maxReconnectAttempts = 10;
-  static const Duration _reconnectDelay = Duration(seconds: 5);
-
-  /// Callback for when a message is received
-  Function(Message)? onMessageReceived;
-
-  /// Callback for when a contact is received
-  Function(Contact)? onContactReceived;
-
-  /// Callback for connection state changes
-  Function(bool isConnected)? onConnectionStateChanged;
-
-  /// Callback for errors
-  Function(String error)? onError;
-
-  /// Check if client is connected
-  bool get isConnected => _isConnected;
-
-  /// Check if client is currently connecting
-  bool get isConnecting => _isConnecting;
-
-  /// Get current reconnection attempt number
-  int get reconnectionAttempts => _reconnectAttempts;
-
-  /// Get maximum reconnection attempts
-  int get maxReconnectionAttempts => _maxReconnectAttempts;
-
-  /// Get server URL
-  String? get serverUrl => _serverUrl;
-
-  /// Connect to SSE server
-  Future<void> connect({required String serverUrl, String? authToken}) async {
-    if (_isConnected) {
-      debugPrint('⚠️ [SseClient] Already connected');
-      return;
-    }
-
-    _serverUrl = serverUrl;
-    _authToken = authToken;
-    _isConnecting = true;
-
-    debugPrint(
-      '🔌 [SseClient] Connecting to $serverUrl (attempt ${_reconnectAttempts + 1}/$_maxReconnectAttempts)',
-    );
-
-    try {
-      // Create a new HTTP client with custom configuration for SSE streaming
-      // Using IOClient with custom HttpClient for better control over connection settings
-      final ioHttpClient = io.HttpClient();
-      ioHttpClient.connectionTimeout = const Duration(seconds: 10);
-      ioHttpClient.idleTimeout = const Duration(
-        hours: 1,
-      ); // Keep SSE connections alive
-      _httpClient = io_client.IOClient(ioHttpClient);
-
-      // Test server availability
-      await _checkServerStatus();
-
-      // Fetch initial message history
-      await _fetchMessageHistory();
-
-      // Fetch initial contact list
-      await _fetchContacts();
-
-      // Subscribe to SSE streams
-      debugPrint('🔗 [SseClient] Subscribing to message stream...');
-      debugPrint(
-        '🔗 [SseClient] Using HTTP client type: ${_httpClient.runtimeType}',
-      );
-      await _subscribeToMessages();
-      debugPrint('🔗 [SseClient] Subscribing to contact stream...');
-      await _subscribeToContacts();
-      debugPrint('🔗 [SseClient] All subscriptions complete');
-
-      _isConnected = true;
-      _isConnecting = false;
-      _hasConnectedBefore = true; // Mark that we've successfully connected
-      _reconnectAttempts = 0;
-      debugPrint('🔔 [SseClient] Calling onConnectionStateChanged(true)');
-      onConnectionStateChanged?.call(true);
-
-      // Start heartbeat to detect connection loss
-      _startHeartbeat();
-
-      debugPrint('✅ [SseClient] Connected successfully');
-    } catch (e) {
-      _isConnecting = false;
-      _httpClient?.close();
-      _httpClient = null;
-      debugPrint('❌ [SseClient] Connection failed: $e');
-      onError?.call('Connection failed: $e');
-
-      // Only auto-reconnect if we've successfully connected before
-      // Initial connection failures should be handled by the user
-      if (_hasConnectedBefore) {
-        _scheduleReconnect();
-      }
-    }
-  }
-
-  /// Disconnect from SSE server
-  Future<void> disconnect() async {
-    debugPrint('🔌 [SseClient] Disconnecting...');
-
-    _isConnected = false;
-    _isConnecting = false;
-    _hasConnectedBefore = false; // Reset on manual disconnect
-    _reconnectTimer?.cancel();
-    _heartbeatTimer?.cancel();
-    await _messageSubscription?.cancel();
-    await _contactSubscription?.cancel();
-    _httpClient?.close();
-
-    _serverUrl = null;
-    _authToken = null;
-    _httpClient = null;
-
-    onConnectionStateChanged?.call(false);
-
-    debugPrint('✅ [SseClient] Disconnected');
-  }
-
-  /// Check server status
-  Future<void> _checkServerStatus() async {
-    final url = Uri.parse('$_serverUrl/api/status');
-
-    try {
-      final response = await http
-          .get(url, headers: _getHeaders())
-          .timeout(const Duration(seconds: 5));
-
-      if (response.statusCode != 200) {
-        throw Exception('Server returned ${response.statusCode}');
-      }
-
-      final data = jsonDecode(response.body);
-      debugPrint('📊 [SseClient] Server status: ${data['status']}');
-      debugPrint('   Connected clients: ${data['connectedClients']}');
-      debugPrint('   Messages: ${data['messageCount']}');
-      debugPrint('   Contacts: ${data['contactCount']}');
-    } catch (e) {
-      // Wrap the error with more user-friendly message
-      throw Exception(_formatConnectionError(e));
-    }
-  }
-
-  /// Format connection error to be more user-friendly
-  String _formatConnectionError(dynamic error) {
-    final errorStr = error.toString();
-
-    // Extract the actual server URL being connected to
-    final serverUri = Uri.tryParse(_serverUrl ?? '');
-    final host = serverUri?.host ?? 'unknown';
-    final port = serverUri?.port ?? 0;
-
-    if (errorStr.contains('Connection refused')) {
-      return 'Server not available at $host:$port. The server may be offline or not running.';
-    } else if (errorStr.contains('TimeoutException') ||
-        errorStr.contains('timed out')) {
-      return 'Connection to $host:$port timed out. Check your network connection.';
-    } else if (errorStr.contains('SocketException')) {
-      return 'Network error connecting to $host:$port. Check your network connection.';
-    } else if (errorStr.contains('Failed host lookup')) {
-      return 'Could not resolve hostname: $host';
-    }
-
-    // Return the original error if we can't make it more user-friendly
-    return errorStr;
-  }
-
-  /// Fetch message history on connect
-  Future<void> _fetchMessageHistory() async {
-    try {
-      final url = Uri.parse('$_serverUrl/api/messages/history');
-      final response = await http
-          .get(url, headers: _getHeaders())
-          .timeout(const Duration(seconds: 10));
-
-      if (response.statusCode != 200) {
-        throw Exception(
-          'Failed to fetch message history: ${response.statusCode}',
-        );
-      }
-
-      final data = jsonDecode(response.body) as Map<String, dynamic>;
-      final messages = data['messages'] as List;
-
-      debugPrint(
-        '📥 [SseClient] Received ${messages.length} messages from history',
-      );
-
-      for (final msgJson in messages) {
-        try {
-          final message = _messageFromJson(msgJson);
-          onMessageReceived?.call(message);
-        } catch (e) {
-          debugPrint('⚠️ [SseClient] Failed to parse message: $e');
-        }
-      }
-    } catch (e) {
-      debugPrint('❌ [SseClient] Error fetching message history: $e');
-      // Don't throw - continue with connection even if history fetch fails
-    }
-  }
-
-  /// Fetch contacts on connect
-  Future<void> _fetchContacts() async {
-    try {
-      final url = Uri.parse('$_serverUrl/api/contacts');
-      final response = await http
-          .get(url, headers: _getHeaders())
-          .timeout(const Duration(seconds: 10));
-
-      if (response.statusCode != 200) {
-        throw Exception('Failed to fetch contacts: ${response.statusCode}');
-      }
-
-      final data = jsonDecode(response.body) as Map<String, dynamic>;
-      final contacts = data['contacts'] as List;
-
-      debugPrint('📥 [SseClient] Received ${contacts.length} contacts');
-
-      for (final contactJson in contacts) {
-        try {
-          final contact = _contactFromJson(contactJson);
-          onContactReceived?.call(contact);
-        } catch (e) {
-          debugPrint('⚠️ [SseClient] Failed to parse contact: $e');
-        }
-      }
-    } catch (e) {
-      debugPrint('❌ [SseClient] Error fetching contacts: $e');
-      // Don't throw - continue with connection even if contacts fetch fails
-    }
-  }
-
-  /// Subscribe to SSE message stream
-  Future<void> _subscribeToMessages() async {
-    try {
-      if (_httpClient == null) {
-        throw Exception('HTTP client not initialized');
-      }
-
-      debugPrint('📡 [SseClient] Creating message stream request...');
-      final url = Uri.parse('$_serverUrl/sse/messages');
-      final request = http.Request('GET', url);
-      request.headers.addAll(_getHeaders());
-      request.headers['Accept'] = 'text/event-stream';
-      request.headers['Cache-Control'] = 'no-cache';
-
-      debugPrint('📡 [SseClient] Sending message stream request to $url');
-      debugPrint('📡 [SseClient] Request headers: ${request.headers}');
-
-      final streamedResponse = await _httpClient!
-          .send(request)
-          .timeout(
-            const Duration(seconds: 10),
-            onTimeout: () {
-              debugPrint('❌ [SseClient] Timeout waiting for response headers');
-              throw TimeoutException(
-                'Message stream connection timed out after 10 seconds',
-              );
-            },
-          );
-
-      debugPrint(
-        '📡 [SseClient] Received response with status: ${streamedResponse.statusCode}',
-      );
-      debugPrint(
-        '📡 [SseClient] Response headers: ${streamedResponse.headers}',
-      );
-      debugPrint(
-        '📡 [SseClient] Response content length: ${streamedResponse.contentLength}',
-      );
-      debugPrint(
-        '📡 [SseClient] Response is redirect: ${streamedResponse.isRedirect}',
-      );
-
-      if (streamedResponse.statusCode != 200) {
-        throw Exception(
-          'SSE messages subscription failed: ${streamedResponse.statusCode}',
-        );
-      }
-
-      debugPrint(
-        '📡 [SseClient] Message stream response received, status: ${streamedResponse.statusCode}',
-      );
-      debugPrint('📡 [SseClient] Setting up stream listener...');
-
-      _messageSubscription = streamedResponse.stream
-          .transform(utf8.decoder)
-          .transform(const LineSplitter())
-          .listen(
-            (line) {
-              debugPrint('📨 [SseClient] Received line: "$line"');
-              _handleSseLine(line, 'message');
-            },
-            onError: (error, stackTrace) {
-              debugPrint('❌ [SseClient] Message stream error: $error');
-              debugPrint('   Stack trace: $stackTrace');
-              _handleDisconnect();
-            },
-            onDone: () {
-              debugPrint(
-                '⚠️ [SseClient] Message stream closed (onDone called)',
-              );
-              _handleDisconnect();
-            },
-            cancelOnError: false,
-          );
-
-      debugPrint('✅ [SseClient] Message stream listener set up successfully');
-    } catch (e) {
-      debugPrint('❌ [SseClient] Error subscribing to message stream: $e');
-      rethrow;
-    }
-  }
-
-  /// Subscribe to SSE contact stream
-  Future<void> _subscribeToContacts() async {
-    try {
-      if (_httpClient == null) {
-        throw Exception('HTTP client not initialized');
-      }
-
-      debugPrint('📡 [SseClient] Creating contact stream request...');
-      final url = Uri.parse('$_serverUrl/sse/contacts');
-      final request = http.Request('GET', url);
-      request.headers.addAll(_getHeaders());
-      request.headers['Accept'] = 'text/event-stream';
-      request.headers['Cache-Control'] = 'no-cache';
-
-      debugPrint('📡 [SseClient] Sending contact stream request to $url');
-      final streamedResponse = await _httpClient!
-          .send(request)
-          .timeout(
-            const Duration(seconds: 10),
-            onTimeout: () {
-              throw TimeoutException(
-                'Contact stream connection timed out after 10 seconds',
-              );
-            },
-          );
-
-      if (streamedResponse.statusCode != 200) {
-        throw Exception(
-          'SSE contacts subscription failed: ${streamedResponse.statusCode}',
-        );
-      }
-
-      debugPrint(
-        '📡 [SseClient] Contact stream response received, status: ${streamedResponse.statusCode}',
-      );
-      debugPrint('📡 [SseClient] Setting up contact stream listener...');
-
-      _contactSubscription = streamedResponse.stream
-          .transform(utf8.decoder)
-          .transform(const LineSplitter())
-          .listen(
-            (line) {
-              debugPrint('📨 [SseClient] Received contact line: "$line"');
-              _handleSseLine(line, 'contact');
-            },
-            onError: (error, stackTrace) {
-              debugPrint('❌ [SseClient] Contact stream error: $error');
-              debugPrint('   Stack trace: $stackTrace');
-              _handleDisconnect();
-            },
-            onDone: () {
-              debugPrint(
-                '⚠️ [SseClient] Contact stream closed (onDone called)',
-              );
-              _handleDisconnect();
-            },
-            cancelOnError: false,
-          );
-
-      debugPrint('✅ [SseClient] Contact stream listener set up successfully');
-    } catch (e) {
-      debugPrint('❌ [SseClient] Error subscribing to contact stream: $e');
-      rethrow;
-    }
-  }
-
-  /// Handle SSE line
-  String _eventType = '';
-  void _handleSseLine(String line, String streamType) {
-    if (line.isEmpty) {
-      // Event complete, reset
-      _eventType = '';
-      return;
-    }
-
-    if (line.startsWith('event:')) {
-      _eventType = line.substring(6).trim();
-    } else if (line.startsWith('data:')) {
-      final jsonData = line.substring(5).trim();
-      try {
-        final data = jsonDecode(jsonData) as Map<String, dynamic>;
-
-        if (streamType == 'message' && _eventType == 'message') {
-          final message = _messageFromJson(data);
-          onMessageReceived?.call(message);
-        } else if (streamType == 'contact' && _eventType == 'contact') {
-          final contact = _contactFromJson(data);
-          onContactReceived?.call(contact);
-        }
-      } catch (e) {
-        debugPrint('⚠️ [SseClient] Failed to parse SSE data: $e');
-      }
-    }
-  }
-
-  /// Handle disconnect
-  void _handleDisconnect() {
-    if (!_isConnected) return;
-
-    _isConnected = false;
-    onConnectionStateChanged?.call(false);
-
-    _scheduleReconnect();
-  }
-
-  /// Schedule reconnection attempt
-  void _scheduleReconnect() {
-    if (_reconnectAttempts >= _maxReconnectAttempts) {
-      debugPrint('❌ [SseClient] Max reconnection attempts reached');
-      onError?.call('Max reconnection attempts reached');
-      return;
-    }
-
-    _reconnectAttempts++;
-    final delay = _reconnectDelay * _reconnectAttempts;
-
-    debugPrint(
-      '🔄 [SseClient] Scheduling reconnect attempt $_reconnectAttempts in ${delay.inSeconds}s',
-    );
-
-    _reconnectTimer?.cancel();
-    _reconnectTimer = Timer(delay, () {
-      if (_serverUrl != null) {
-        connect(serverUrl: _serverUrl!, authToken: _authToken);
-      }
-    });
-  }
-
-  /// Start heartbeat to detect connection loss
-  void _startHeartbeat() {
-    _heartbeatTimer?.cancel();
-    _heartbeatTimer = Timer.periodic(const Duration(seconds: 30), (
-      timer,
-    ) async {
-      try {
-        await _checkServerStatus();
-      } catch (e) {
-        debugPrint('⚠️ [SseClient] Heartbeat failed: $e');
-        _handleDisconnect();
-      }
-    });
-  }
-
-  /// Send message to server
-  Future<bool> sendMessage({
-    required String recipientPublicKey,
-    required String text,
-  }) async {
-    if (!_isConnected || _serverUrl == null) {
-      throw Exception('Not connected to server');
-    }
-
-    try {
-      final url = Uri.parse('$_serverUrl/api/messages');
-      final response = await http
-          .post(
-            url,
-            headers: {..._getHeaders(), 'Content-Type': 'application/json'},
-            body: jsonEncode({
-              'recipientPublicKey': recipientPublicKey,
-              'text': text,
-            }),
-          )
-          .timeout(const Duration(seconds: 10));
-
-      if (response.statusCode != 200) {
-        throw Exception('Send message failed: ${response.statusCode}');
-      }
-
-      final data = jsonDecode(response.body) as Map<String, dynamic>;
-      return data['success'] as bool? ?? false;
-    } catch (e) {
-      debugPrint('❌ [SseClient] Error sending message: $e');
-      rethrow;
-    }
-  }
-
-  /// Send channel message to server
-  Future<void> sendChannelMessage({
-    required int channelIdx,
-    required String text,
-  }) async {
-    if (!_isConnected || _serverUrl == null) {
-      throw Exception('Not connected to server');
-    }
-
-    try {
-      final url = Uri.parse('$_serverUrl/api/messages/channel');
-      final response = await http
-          .post(
-            url,
-            headers: {..._getHeaders(), 'Content-Type': 'application/json'},
-            body: jsonEncode({'channelIdx': channelIdx, 'text': text}),
-          )
-          .timeout(const Duration(seconds: 10));
-
-      if (response.statusCode != 200) {
-        throw Exception('Send channel message failed: ${response.statusCode}');
-      }
-    } catch (e) {
-      debugPrint('❌ [SseClient] Error sending channel message: $e');
-      rethrow;
-    }
-  }
-
-  /// Request contact sync
-  Future<void> syncContacts() async {
-    if (!_isConnected || _serverUrl == null) {
-      throw Exception('Not connected to server');
-    }
-
-    try {
-      final url = Uri.parse('$_serverUrl/api/contacts/sync');
-      final response = await http
-          .post(url, headers: _getHeaders())
-          .timeout(const Duration(seconds: 10));
-
-      if (response.statusCode != 200) {
-        throw Exception('Contact sync failed: ${response.statusCode}');
-      }
-
-      debugPrint('✅ [SseClient] Contact sync requested');
-    } catch (e) {
-      debugPrint('❌ [SseClient] Error syncing contacts: $e');
-      rethrow;
-    }
-  }
-
-  /// Get headers for HTTP requests
-  Map<String, String> _getHeaders() {
-    final headers = <String, String>{};
-    if (_authToken != null) {
-      headers['Authorization'] = 'Bearer $_authToken';
-    }
-    return headers;
-  }
-
-  /// Convert JSON to Message
-  Message _messageFromJson(Map<String, dynamic> json) {
-    return Message(
-      id: json['id'] as String,
-      messageType: MessageType.values.firstWhere(
-        (e) => e.name == json['messageType'],
-        orElse: () => MessageType.contact,
-      ),
-      senderPublicKeyPrefix: json['senderPublicKeyPrefix'] != null
-          ? Uint8List.fromList(
-              (json['senderPublicKeyPrefix'] as List).cast<int>(),
-            )
-          : null,
-      channelIdx: json['channelIdx'] as int?,
-      pathLen: json['pathLen'] as int,
-      textType: MessageTextType.fromValue(json['textType'] as int),
-      senderTimestamp: json['senderTimestamp'] as int,
-      text: json['text'] as String,
-      isSarMarker: json['isSarMarker'] as bool? ?? false,
-      sarGpsCoordinates: json['sarGpsCoordinates'] != null
-          ? LatLng(
-              (json['sarGpsCoordinates']['latitude'] as num).toDouble(),
-              (json['sarGpsCoordinates']['longitude'] as num).toDouble(),
-            )
-          : null,
-      sarNotes: json['sarNotes'] as String?,
-      sarCustomEmoji: json['sarCustomEmoji'] as String?,
-      sarColorIndex: json['sarColorIndex'] as int?,
-      receivedAt: DateTime.parse(json['receivedAt'] as String),
-      senderName: json['senderName'] as String?,
-      deliveryStatus: MessageDeliveryStatus.values.firstWhere(
-        (e) => e.name == json['deliveryStatus'],
-        orElse: () => MessageDeliveryStatus.received,
-      ),
-      expectedAckTag: json['expectedAckTag'] as int?,
-      suggestedTimeoutMs: json['suggestedTimeoutMs'] as int?,
-      roundTripTimeMs: json['roundTripTimeMs'] as int?,
-      deliveredAt: json['deliveredAt'] != null
-          ? DateTime.parse(json['deliveredAt'] as String)
-          : null,
-      recipientPublicKey: json['recipientPublicKey'] != null
-          ? Uint8List.fromList((json['recipientPublicKey'] as List).cast<int>())
-          : null,
-      retryAttempt: json['retryAttempt'] as int? ?? 0,
-      lastRetryAt: json['lastRetryAt'] != null
-          ? DateTime.parse(json['lastRetryAt'] as String)
-          : null,
-      usedFloodFallback: json['usedFloodFallback'] as bool? ?? false,
-      isRead: json['isRead'] as bool? ?? false,
-      echoCount: json['echoCount'] as int? ?? 0,
-      firstEchoAt: json['firstEchoAt'] != null
-          ? DateTime.parse(json['firstEchoAt'] as String)
-          : null,
-      lastEchoSnrRaw: json['lastEchoSnrRaw'] as int?,
-      lastEchoRssiDbm: json['lastEchoRssiDbm'] as int?,
-      lastEchoAt: json['lastEchoAt'] != null
-          ? DateTime.parse(json['lastEchoAt'] as String)
-          : null,
-      isDrawing: json['isDrawing'] as bool? ?? false,
-      drawingId: json['drawingId'] as String?,
-    );
-  }
-
-  /// Convert JSON to Contact
-  Contact _contactFromJson(Map<String, dynamic> json) {
-    return Contact(
-      publicKey: Uint8List.fromList((json['publicKey'] as List).cast<int>()),
-      type: ContactType.fromValue(json['type'] as int),
-      flags: json['flags'] as int,
-      outPathLen: json['outPathLen'] as int,
-      outPath: Uint8List.fromList((json['outPath'] as List).cast<int>()),
-      advName: json['advName'] as String,
-      lastAdvert: json['lastAdvert'] as int,
-      advLat: json['advLat'] as int,
-      advLon: json['advLon'] as int,
-      lastMod: json['lastMod'] as int,
-    );
-  }
-
-  /// Dispose resources
-  void dispose() {
-    disconnect();
-  }
-}

lib/services/update_checker_service.dart

@@ -5,16 +5,19 @@ import '../models/update_info.dart';
 import 'build_info_service.dart';
 
 /// Service for checking if a new app version is available
-/// Compares current build's commit hash with latest manifest from server
+/// Compares current build's commit hash with latest GitHub release
 class UpdateCheckerService {
-  static final UpdateCheckerService _instance = UpdateCheckerService._internal();
+  static final UpdateCheckerService _instance =
+      UpdateCheckerService._internal();
   factory UpdateCheckerService() => _instance;
   UpdateCheckerService._internal();
 
   final BuildInfoService _buildInfoService = BuildInfoService();
 
-  // Manifest URL for the latest unstable build
-  static const String _manifestUrl = 'https://meshcore-sar.dz0ny.dev/unstable/latest/manifest.json';
+  static const String _repoOwner = 'dz0ny';
+  static const String _repoName = 'meshcore-sar';
+  static const String _latestReleaseUrl =
+      'https://api.github.com/repos/$_repoOwner/$_repoName/releases/latest';
 
   /// Check if an update is available
   /// Returns UpdateInfo with availability status and download URL if available
@@ -25,61 +28,78 @@ class UpdateCheckerService {
 
       // Skip check for dev builds (local development)
       if (currentCommitHash == 'dev' || currentCommitHash == 'unknown') {
-        debugPrint('[UpdateChecker] Skipping update check for dev/unknown build');
+        debugPrint(
+          '[UpdateChecker] Skipping update check for dev/unknown build',
+        );
         return UpdateInfo.noUpdate(currentCommitHash);
       }
 
       debugPrint('[UpdateChecker] Current commit hash: $currentCommitHash');
-      debugPrint('[UpdateChecker] Fetching latest manifest from: $_manifestUrl');
-
-      // Fetch manifest from server
-      final response = await http.get(
-        Uri.parse(_manifestUrl),
-        headers: {'Accept': 'application/json'},
-      ).timeout(
-        const Duration(seconds: 10),
-        onTimeout: () {
-          debugPrint('[UpdateChecker] Manifest fetch timed out');
-          throw Exception('Manifest fetch timed out');
-        },
+      debugPrint(
+        '[UpdateChecker] Fetching latest release from: $_latestReleaseUrl',
       );
 
+      // Fetch latest release from GitHub
+      final response = await http
+          .get(
+            Uri.parse(_latestReleaseUrl),
+            headers: {
+              'Accept': 'application/vnd.github+json',
+              'X-GitHub-Api-Version': '2022-11-28',
+            },
+          )
+          .timeout(
+            const Duration(seconds: 10),
+            onTimeout: () {
+              debugPrint('[UpdateChecker] Latest release fetch timed out');
+              throw Exception('Latest release fetch timed out');
+            },
+          );
+
       if (response.statusCode != 200) {
-        debugPrint('[UpdateChecker] Failed to fetch manifest: ${response.statusCode}');
+        debugPrint(
+          '[UpdateChecker] Failed to fetch release: ${response.statusCode}',
+        );
         return UpdateInfo.noUpdate(currentCommitHash);
       }
 
-      // Parse manifest JSON
-      final Map<String, dynamic> manifest = json.decode(response.body);
-      final latestCommitHash = manifest['commit'] as String?;
-      final commitShort = manifest['commit_short'] as String?;
-      final buildId = manifest['build_id'] as String?;
-      final timestamp = manifest['timestamp'] as String?;
-      final artifacts = manifest['artifacts'] as List<dynamic>?;
+      // Parse release JSON
+      final Map<String, dynamic> release = json.decode(response.body);
+      final tagName = release['tag_name'] as String?;
+      final targetCommitish = release['target_commitish'] as String?;
+      final publishedAt = release['published_at'] as String?;
+      final assets = release['assets'] as List<dynamic>?;
 
-      if (latestCommitHash == null || commitShort == null) {
-        debugPrint('[UpdateChecker] Invalid manifest: missing commit information');
+      if (tagName == null) {
+        debugPrint('[UpdateChecker] Invalid release: missing tag_name');
         return UpdateInfo.noUpdate(currentCommitHash);
       }
 
-      debugPrint('[UpdateChecker] Latest commit hash: $latestCommitHash');
-      debugPrint('[UpdateChecker] Latest commit short: $commitShort');
+      debugPrint('[UpdateChecker] Latest release tag: $tagName');
+      if (targetCommitish != null && targetCommitish.isNotEmpty) {
+        debugPrint(
+          '[UpdateChecker] Release target commitish: $targetCommitish',
+        );
+      }
 
-      // Compare commit hashes
-      // Current hash might be full SHA or short (7 chars)
-      // Latest from manifest is full SHA
-      final isUpdateAvailable = !_compareCommitHashes(currentCommitHash, latestCommitHash);
+      final isUpdateAvailable = await _isUpdateAvailable(
+        currentCommitHash: currentCommitHash,
+        releaseTag: tagName,
+        targetCommitish: targetCommitish,
+      );
 
       if (!isUpdateAvailable) {
-        debugPrint('[UpdateChecker] No update available (same commit)');
+        debugPrint('[UpdateChecker] No update available');
         return UpdateInfo.noUpdate(currentCommitHash);
       }
 
-      // Find Android APK in artifacts
-      final String? apkUrl = _findAndroidApkUrl(artifacts);
+      // Find Android APK in release assets
+      final String? apkUrl = _findAndroidApkUrl(assets);
 
       if (apkUrl == null) {
-        debugPrint('[UpdateChecker] Update available but no APK found in artifacts');
+        debugPrint(
+          '[UpdateChecker] Update available but no APK found in artifacts',
+        );
         return UpdateInfo.noUpdate(currentCommitHash);
       }
 
@@ -87,10 +107,10 @@ class UpdateCheckerService {
 
       return UpdateInfo.available(
         currentCommitHash: currentCommitHash,
-        latestCommitHash: commitShort,
+        latestCommitHash: _formatLatestVersion(targetCommitish, tagName),
         downloadUrl: apkUrl,
-        buildId: buildId,
-        timestamp: timestamp,
+        buildId: tagName,
+        timestamp: publishedAt,
       );
     } catch (e) {
       debugPrint('[UpdateChecker] Error checking for update: $e');
@@ -118,15 +138,94 @@ class UpdateCheckerService {
     return false;
   }
 
-  /// Find Android APK URL in artifacts list
-  String? _findAndroidApkUrl(List<dynamic>? artifacts) {
-    if (artifacts == null || artifacts.isEmpty) return null;
+  Future<bool> _isUpdateAvailable({
+    required String currentCommitHash,
+    required String releaseTag,
+    required String? targetCommitish,
+  }) async {
+    // Prefer direct SHA compare when release target is a hash.
+    if (_looksLikeSha(targetCommitish)) {
+      return !_compareCommitHashes(currentCommitHash, targetCommitish!);
+    }
 
-    // Look for .apk file in artifacts
-    for (final artifact in artifacts) {
-      if (artifact is String && artifact.toLowerCase().endsWith('.apk')) {
-        // Construct full URL
-        return 'https://meshcore-sar.dz0ny.dev/unstable/latest/$artifact';
+    // Fallback: ask GitHub how current commit compares to the release tag.
+    final compareResult = await _compareWithReleaseTag(
+      currentCommitHash,
+      releaseTag,
+    );
+    if (compareResult != null) {
+      return compareResult;
+    }
+
+    // If we cannot compare, do not force update prompts.
+    return false;
+  }
+
+  Future<bool?> _compareWithReleaseTag(
+    String currentCommitHash,
+    String releaseTag,
+  ) async {
+    try {
+      final compareUrl =
+          'https://api.github.com/repos/$_repoOwner/$_repoName/compare/$currentCommitHash...$releaseTag';
+      final response = await http
+          .get(
+            Uri.parse(compareUrl),
+            headers: {
+              'Accept': 'application/vnd.github+json',
+              'X-GitHub-Api-Version': '2022-11-28',
+            },
+          )
+          .timeout(const Duration(seconds: 10));
+
+      if (response.statusCode != 200) {
+        debugPrint(
+          '[UpdateChecker] Compare API failed: ${response.statusCode}',
+        );
+        return null;
+      }
+
+      final Map<String, dynamic> comparison = json.decode(response.body);
+      final status = comparison['status'] as String?;
+      debugPrint('[UpdateChecker] Compare status: $status');
+
+      if (status == 'behind') return true;
+      if (status == 'identical' || status == 'ahead') return false;
+
+      // "diverged" means the release and current commit differ.
+      if (status == 'diverged') return true;
+    } catch (e) {
+      debugPrint('[UpdateChecker] Compare API error: $e');
+    }
+    return null;
+  }
+
+  bool _looksLikeSha(String? value) {
+    if (value == null) return false;
+    final v = value.trim();
+    if (v.length < 7 || v.length > 40) return false;
+    return RegExp(r'^[a-fA-F0-9]+$').hasMatch(v);
+  }
+
+  String _formatLatestVersion(String? targetCommitish, String tagName) {
+    if (_looksLikeSha(targetCommitish)) {
+      return targetCommitish!.substring(0, 7).toLowerCase();
+    }
+    return tagName;
+  }
+
+  /// Find Android APK URL in release assets list
+  String? _findAndroidApkUrl(List<dynamic>? assets) {
+    if (assets == null || assets.isEmpty) return null;
+
+    for (final asset in assets) {
+      if (asset is! Map<String, dynamic>) continue;
+      final name = (asset['name'] as String?)?.toLowerCase() ?? '';
+      if (!name.endsWith('.apk')) continue;
+
+      final browserDownloadUrl = asset['browser_download_url'] as String?;
+      if (browserDownloadUrl != null && browserDownloadUrl.isNotEmpty) {
+        return browserDownloadUrl;
       }
     }
 

lib/services/voice_codec_service.dart

@@ -1,89 +1,2 @@
-import 'dart:typed_data';
-import 'package:codec2_flutter/codec2_flutter.dart';
-import 'package:flutter/foundation.dart';
-import '../utils/voice_message_parser.dart';
-
-export 'package:codec2_flutter/codec2_flutter.dart' show Codec2Mode;
-
-/// Maps [VoicePacketMode] to the [Codec2Mode] enum from the FFI plugin.
-Codec2Mode codec2ModeFor(VoicePacketMode pktMode) {
-  switch (pktMode) {
-    case VoicePacketMode.mode3200: return Codec2Mode.mode3200;
-    case VoicePacketMode.mode1600: return Codec2Mode.mode1600;
-    case VoicePacketMode.mode1400: return Codec2Mode.mode1400;
-    case VoicePacketMode.mode700c: return Codec2Mode.mode700c;
-    case VoicePacketMode.mode1200: return Codec2Mode.mode1200;
-    case VoicePacketMode.mode1300: return Codec2Mode.mode1300;
-    case VoicePacketMode.mode2400: return Codec2Mode.mode2400;
-  }
-}
-
-/// Selects the [VoicePacketMode] best suited for a given LoRa radio bandwidth.
-///
-/// Call with [radioBandwidthHz] from the device's radio params
-/// (e.g. 125000 for 125 kHz).
-VoicePacketMode voiceModeForBandwidth(int radioBandwidthHz) {
-  if (radioBandwidthHz <= 62500) return VoicePacketMode.mode700c;
-  if (radioBandwidthHz <= 125000) return VoicePacketMode.mode1200;
-  return VoicePacketMode.mode1300;
-}
-
-/// High-level codec service that provides async Codec2 encode/decode
-/// executed in a background isolate so the UI thread is never blocked.
-class VoiceCodecService {
-  void _ensureCodec2Supported() {
-    if (kIsWeb ||
-        (defaultTargetPlatform != TargetPlatform.iOS &&
-            defaultTargetPlatform != TargetPlatform.android)) {
-      throw UnsupportedError('Codec2 is enabled only on iOS and Android.');
-    }
-  }
-
-  /// Encode [pcm] (Int16 samples, 8000 Hz mono) with [mode].
-  /// Returns the raw Codec2-encoded bytes.
-  Future<Uint8List> encode(Int16List pcm, VoicePacketMode mode) {
-    _ensureCodec2Supported();
-    return Codec2.encodeInIsolate(pcm, codec2ModeFor(mode));
-  }
-
-  /// Decode [codec2Bytes] back to Int16 PCM (8000 Hz mono) with [mode].
-  Future<Int16List> decode(Uint8List codec2Bytes, VoicePacketMode mode) {
-    _ensureCodec2Supported();
-    return Codec2.decodeInIsolate(codec2Bytes, codec2ModeFor(mode));
-  }
-
-  /// Decode and concatenate multiple [packets] into a single PCM Int16List.
-  /// Packets with null/missing entries are substituted with silence.
-  Future<Int16List> decodePackets(
-    List<VoicePacket?> packets,
-    VoicePacketMode mode,
-  ) async {
-    _ensureCodec2Supported();
-    final c2Mode = codec2ModeFor(mode);
-    final c2 = Codec2.create(c2Mode);
-    final spf = c2.samplesPerFrame;
-    c2.destroy();
-
-    // Estimate total samples (use actual data or silence per missing packet)
-    final all = <Int16List>[];
-    for (final pkt in packets) {
-      if (pkt == null || pkt.codec2Data.isEmpty) {
-        // Silence for missing packet — duration approximated by mode
-        final silenceSamples = (codec2ModeFor(mode).framesPerSecond) * spf;
-        all.add(Int16List(silenceSamples));
-      } else {
-        final decoded = await Codec2.decodeInIsolate(pkt.codec2Data, c2Mode);
-        all.add(decoded);
-      }
-    }
-
-    final total = all.fold<int>(0, (sum, l) => sum + l.length);
-    final result = Int16List(total);
-    var offset = 0;
-    for (final chunk in all) {
-      result.setRange(offset, offset + chunk.length, chunk);
-      offset += chunk.length;
-    }
-    return result;
-  }
-}
+export 'voice_codec_service_stub.dart'
+    if (dart.library.io) 'voice_codec_service_io.dart';

lib/services/voice_codec_service_io.dart

@@ -0,0 +1,89 @@
+import 'dart:typed_data';
+import 'package:codec2_flutter/codec2_flutter.dart';
+import 'package:flutter/foundation.dart';
+import '../utils/voice_message_parser.dart';
+
+export 'package:codec2_flutter/codec2_flutter.dart' show Codec2Mode;
+
+/// Maps [VoicePacketMode] to the [Codec2Mode] enum from the FFI plugin.
+Codec2Mode codec2ModeFor(VoicePacketMode pktMode) {
+  switch (pktMode) {
+    case VoicePacketMode.mode3200: return Codec2Mode.mode3200;
+    case VoicePacketMode.mode1600: return Codec2Mode.mode1600;
+    case VoicePacketMode.mode1400: return Codec2Mode.mode1400;
+    case VoicePacketMode.mode700c: return Codec2Mode.mode700c;
+    case VoicePacketMode.mode1200: return Codec2Mode.mode1200;
+    case VoicePacketMode.mode1300: return Codec2Mode.mode1300;
+    case VoicePacketMode.mode2400: return Codec2Mode.mode2400;
+  }
+}
+
+/// Selects the [VoicePacketMode] best suited for a given LoRa radio bandwidth.
+///
+/// Call with [radioBandwidthHz] from the device's radio params
+/// (e.g. 125000 for 125 kHz).
+VoicePacketMode voiceModeForBandwidth(int radioBandwidthHz) {
+  if (radioBandwidthHz <= 62500) return VoicePacketMode.mode700c;
+  if (radioBandwidthHz <= 125000) return VoicePacketMode.mode1200;
+  return VoicePacketMode.mode1300;
+}
+
+/// High-level codec service that provides async Codec2 encode/decode
+/// executed in a background isolate so the UI thread is never blocked.
+class VoiceCodecService {
+  void _ensureCodec2Supported() {
+    if (kIsWeb ||
+        (defaultTargetPlatform != TargetPlatform.iOS &&
+            defaultTargetPlatform != TargetPlatform.android)) {
+      throw UnsupportedError('Codec2 is enabled only on iOS and Android.');
+    }
+  }
+
+  /// Encode [pcm] (Int16 samples, 8000 Hz mono) with [mode].
+  /// Returns the raw Codec2-encoded bytes.
+  Future<Uint8List> encode(Int16List pcm, VoicePacketMode mode) {
+    _ensureCodec2Supported();
+    return Codec2.encodeInIsolate(pcm, codec2ModeFor(mode));
+  }
+
+  /// Decode [codec2Bytes] back to Int16 PCM (8000 Hz mono) with [mode].
+  Future<Int16List> decode(Uint8List codec2Bytes, VoicePacketMode mode) {
+    _ensureCodec2Supported();
+    return Codec2.decodeInIsolate(codec2Bytes, codec2ModeFor(mode));
+  }
+
+  /// Decode and concatenate multiple [packets] into a single PCM Int16List.
+  /// Packets with null/missing entries are substituted with silence.
+  Future<Int16List> decodePackets(
+    List<VoicePacket?> packets,
+    VoicePacketMode mode,
+  ) async {
+    _ensureCodec2Supported();
+    final c2Mode = codec2ModeFor(mode);
+    final c2 = Codec2.create(c2Mode);
+    final spf = c2.samplesPerFrame;
+    c2.destroy();
+
+    // Estimate total samples (use actual data or silence per missing packet)
+    final all = <Int16List>[];
+    for (final pkt in packets) {
+      if (pkt == null || pkt.codec2Data.isEmpty) {
+        // Silence for missing packet — duration approximated by mode
+        final silenceSamples = (codec2ModeFor(mode).framesPerSecond) * spf;
+        all.add(Int16List(silenceSamples));
+      } else {
+        final decoded = await Codec2.decodeInIsolate(pkt.codec2Data, c2Mode);
+        all.add(decoded);
+      }
+    }
+
+    final total = all.fold<int>(0, (sum, l) => sum + l.length);
+    final result = Int16List(total);
+    var offset = 0;
+    for (final chunk in all) {
+      result.setRange(offset, offset + chunk.length, chunk);
+      offset += chunk.length;
+    }
+    return result;
+  }
+}

lib/services/voice_codec_service_stub.dart

@@ -0,0 +1,71 @@
+import 'dart:typed_data';
+import '../utils/voice_message_parser.dart';
+
+/// Web/unsupported platform stub — Codec2 FFI is not available.
+enum Codec2Mode {
+  mode3200(0),
+  mode2400(1),
+  mode1600(2),
+  mode1400(3),
+  mode1300(4),
+  mode1200(5),
+  mode700c(8);
+
+  const Codec2Mode(this.c2ModeId);
+  final int c2ModeId;
+
+  int get framesPerSecond => (this == mode3200 || this == mode2400) ? 50 : 25;
+  int get samplesPerFrame => 8000 ~/ framesPerSecond;
+
+  int get bytesPerSecond {
+    switch (this) {
+      case mode3200: return 400;
+      case mode700c: return 100;
+      case mode1200: return 150;
+      case mode1300: return 175;
+      case mode1400: return 175;
+      case mode1600: return 200;
+      case mode2400: return 300;
+    }
+  }
+
+  static const int _maxBytesPerPacket = 160;
+
+  int get packetDurationMs {
+    final bytesPerFrame = bytesPerSecond / framesPerSecond;
+    final framesPerPacket = (_maxBytesPerPacket / bytesPerFrame).floor();
+    return (framesPerPacket * 1000 ~/ framesPerSecond);
+  }
+}
+
+Codec2Mode codec2ModeFor(VoicePacketMode pktMode) {
+  switch (pktMode) {
+    case VoicePacketMode.mode3200: return Codec2Mode.mode3200;
+    case VoicePacketMode.mode1600: return Codec2Mode.mode1600;
+    case VoicePacketMode.mode1400: return Codec2Mode.mode1400;
+    case VoicePacketMode.mode700c: return Codec2Mode.mode700c;
+    case VoicePacketMode.mode1200: return Codec2Mode.mode1200;
+    case VoicePacketMode.mode1300: return Codec2Mode.mode1300;
+    case VoicePacketMode.mode2400: return Codec2Mode.mode2400;
+  }
+}
+
+VoicePacketMode voiceModeForBandwidth(int radioBandwidthHz) {
+  if (radioBandwidthHz <= 62500) return VoicePacketMode.mode700c;
+  if (radioBandwidthHz <= 125000) return VoicePacketMode.mode1200;
+  return VoicePacketMode.mode1300;
+}
+
+class VoiceCodecService {
+  Future<Uint8List> encode(Int16List pcm, VoicePacketMode mode) =>
+      Future.error(UnsupportedError('Voice not supported on web'));
+
+  Future<Int16List> decode(Uint8List codec2Bytes, VoicePacketMode mode) =>
+      Future.error(UnsupportedError('Voice not supported on web'));
+
+  Future<Int16List> decodePackets(
+    List<VoicePacket?> packets,
+    VoicePacketMode mode,
+  ) =>
+      Future.error(UnsupportedError('Voice not supported on web'));
+}

lib/widgets/connection_dialog.dart

@@ -20,7 +20,7 @@ class _ConnectionDialogState extends State<ConnectionDialog>
   final List<DiscoveredServer> _discoveredServers = [];
   int _scannedCount = 0;
   int _totalToScan = 0;
-  String? _connectingToServerUrl; // Track which server is being connected to
+  String? _connectingToServerKey; // Track which server is being connected to (ip:port)
 
   // Named listener method for proper cleanup
   void _onTabChanged() {
@@ -361,61 +361,16 @@ class _ConnectionDialogState extends State<ConnectionDialog>
   }
 
   Widget _buildNetworkServersTab() {
-    final connectionProvider = context.watch<ConnectionProvider>();
     final bool showingCachedResults =
         !_networkScanner.isScanning &&
         _networkScanner.hasCachedResults &&
         _discoveredServers.isNotEmpty;
-    final bool isConnectingToSse = connectionProvider.isSseClientConnecting;
-    final int sseReconnectAttempt =
-        connectionProvider.sseClientReconnectionAttempt;
-    final int sseMaxReconnects =
-        connectionProvider.sseClientMaxReconnectionAttempts;
 
     return Column(
       children: [
-        // SSE Reconnection banner (show when reconnecting)
-        if (isConnectingToSse && sseReconnectAttempt > 0)
-          Container(
-            margin: const EdgeInsets.fromLTRB(16, 16, 16, 8),
-            padding: const EdgeInsets.all(16),
-            decoration: BoxDecoration(
-              color: Theme.of(context).colorScheme.tertiaryContainer,
-              borderRadius: BorderRadius.circular(8),
-            ),
-            child: Row(
-              children: [
-                SizedBox(
-                  width: 20,
-                  height: 20,
-                  child: CircularProgressIndicator(
-                    strokeWidth: 2,
-                    color: Theme.of(context).colorScheme.onTertiaryContainer,
-                  ),
-                ),
-                const SizedBox(width: 12),
-                Expanded(
-                  child: Text(
-                    'Reconnecting to server... (Attempt $sseReconnectAttempt/$sseMaxReconnects)',
-                    style: TextStyle(
-                      color: Theme.of(context).colorScheme.onTertiaryContainer,
-                      fontSize: 13,
-                      fontWeight: FontWeight.w500,
-                    ),
-                  ),
-                ),
-              ],
-            ),
-          ),
-
         // Info banner
         Container(
-          margin: EdgeInsets.fromLTRB(
-            16,
-            isConnectingToSse && sseReconnectAttempt > 0 ? 8 : 16,
-            16,
-            16,
-          ),
+          margin: const EdgeInsets.fromLTRB(16, 16, 16, 16),
           padding: const EdgeInsets.all(16),
           decoration: BoxDecoration(
             color: Theme.of(context).colorScheme.primaryContainer,
@@ -432,7 +387,7 @@ class _ConnectionDialogState extends State<ConnectionDialog>
                 child: Text(
                   showingCachedResults
                       ? 'Showing cached results. Tap refresh to rescan.'
-                      : 'Scanning local network for shared MeshCore devices on port 12929',
+                      : 'Scanning local network for MeshCore WiFi devices on port 5000',
                   style: TextStyle(
                     color: Theme.of(context).colorScheme.onPrimaryContainer,
                     fontSize: 13,
@@ -505,10 +460,11 @@ class _ConnectionDialogState extends State<ConnectionDialog>
                   itemCount: _discoveredServers.length,
                   itemBuilder: (context, index) {
                     final server = _discoveredServers[index];
+                    final serverKey = '${server.ipAddress}:${server.port}';
                     final isConnectingToThisServer =
-                        _connectingToServerUrl == server.serverUrl;
+                        _connectingToServerKey == serverKey;
                     final isAnyConnectionInProgress =
-                        isConnectingToSse || _connectingToServerUrl != null;
+                        _connectingToServerKey != null;
 
                     return Container(
                       margin: const EdgeInsets.symmetric(
@@ -593,7 +549,7 @@ class _ConnectionDialogState extends State<ConnectionDialog>
 
                                 // Mark this server as connecting
                                 setState(() {
-                                  _connectingToServerUrl = server.serverUrl;
+                                  _connectingToServerKey = serverKey;
                                 });
 
                                 try {
@@ -607,8 +563,9 @@ class _ConnectionDialogState extends State<ConnectionDialog>
                                     );
                                   }
 
-                                  await connectionProvider.connectToSseServer(
-                                    serverUrl: server.serverUrl,
+                                  await connectionProvider.connectTcp(
+                                    server.ipAddress,
+                                    server.port,
                                   );
                                   await appProvider.initialize();
 
@@ -619,7 +576,7 @@ class _ConnectionDialogState extends State<ConnectionDialog>
                                   // Clear connecting state on error
                                   if (mounted) {
                                     setState(() {
-                                      _connectingToServerUrl = null;
+                                      _connectingToServerKey = null;
                                     });
 
                                     // Clean up error message (remove "Exception: " prefix)

lib/widgets/messages/image_message_bubble.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:flutter_avif/flutter_avif.dart';
@@ -8,6 +9,7 @@ import '../../providers/connection_provider.dart';
 import '../../providers/contacts_provider.dart';
 import '../../providers/image_provider.dart' as ip;
 import '../../utils/image_message_parser.dart';
+import 'transfer_timeout.dart';
 
 /// A message bubble that shows a received or sent image.
 ///
@@ -29,8 +31,16 @@ class ImageMessageBubble extends StatefulWidget {
 }
 
 class _ImageMessageBubbleState extends State<ImageMessageBubble> {
+  static const int _maxFetchHops = 3;
   bool _isRequesting = false;
   String? _errorText;
+  Timer? _requestTimeoutTimer;
+
+  @override
+  void dispose() {
+    _requestTimeoutTimer?.cancel();
+    super.dispose();
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -82,6 +92,9 @@ class _ImageMessageBubbleState extends State<ImageMessageBubble> {
                     received: received,
                     total: total,
                     envelope: envelope,
+                    radioBw: radioBw,
+                    radioSf: radioSf,
+                    radioCr: radioCr,
                   ),
                 ),
                 const SizedBox(height: 4),
@@ -123,6 +136,9 @@ class _ImageMessageBubbleState extends State<ImageMessageBubble> {
     required int received,
     required int total,
     required ImageEnvelope envelope,
+    required int? radioBw,
+    required int? radioSf,
+    required int? radioCr,
   }) {
     if (isComplete && imageBytes != null) {
       return AspectRatio(
@@ -159,7 +175,13 @@ class _ImageMessageBubbleState extends State<ImageMessageBubble> {
             ] else ...[
               // Tap-to-load icon.
               IconButton(
-                onPressed: () => _requestAndFetch(envelope),
+                onPressed: () => _requestAndFetch(
+                  envelope,
+                  radioBw: radioBw,
+                  radioSf: radioSf,
+                  radioCr: radioCr,
+                  pathLen: widget.message.pathLen,
+                ),
                 icon: const Icon(Icons.download_rounded, size: 40),
                 color: Colors.white70,
                 tooltip: 'Load image',
@@ -171,18 +193,57 @@ class _ImageMessageBubbleState extends State<ImageMessageBubble> {
     );
   }
 
-  Future<void> _requestAndFetch(ImageEnvelope envelope) async {
+  Future<void> _requestAndFetch(
+    ImageEnvelope envelope, {
+    int? radioBw,
+    int? radioSf,
+    int? radioCr,
+    int pathLen = 0,
+  }) async {
     if (_isRequesting) return;
-    final sender = _resolveSender(envelope);
+    var sender = _resolveSender(envelope);
     if (sender == null) {
-      setState(() => _errorText = 'Sender not reachable');
+      final conn = context.read<ConnectionProvider>();
+      await conn.getContacts();
+      if (!mounted) return;
+      sender = _resolveSender(envelope);
+    }
+    if (sender == null) {
+      await _showBlockingAlert(
+        'Cannot fetch image',
+        'Sender contact is unknown. Sync contacts first.',
+      );
       return;
     }
+    if (sender.outPathLen < 0) {
+      await _showBlockingAlert(
+        'Cannot fetch image',
+        'Sender route is unknown. Sync contacts/path first.',
+      );
+      return;
+    }
+    if (sender.outPathLen > _maxFetchHops) {
+      await _showBlockingAlert(
+        'Cannot fetch image',
+        'Message is too far (${sender.outPathLen} hops, max $_maxFetchHops).',
+      );
+      return;
+    }
+    if (sender.outPathLen >= 2) {
+      _showToast(
+        'Image fetch over ${sender.outPathLen} hops may take a while.',
+      );
+    }
 
+    setState(() => _errorText = null);
     final conn = context.read<ConnectionProvider>();
+    final imageProvider = context.read<ip.ImageProvider>();
     final deviceKey = conn.deviceInfo.publicKey;
     if (deviceKey == null || deviceKey.length < 6) {
-      setState(() => _errorText = 'Device key unavailable');
+      await _showBlockingAlert(
+        'Cannot fetch image',
+        'Device key is unavailable.',
+      );
       return;
     }
 
@@ -190,11 +251,24 @@ class _ImageMessageBubbleState extends State<ImageMessageBubble> {
         .sublist(0, 6)
         .map((b) => b.toRadixString(16).padLeft(2, '0'))
         .join();
-    final request = ImageFetchRequest(
-      sessionId: envelope.sessionId,
-      requesterKey6: requesterKey6,
-      timestampSec: DateTime.now().millisecondsSinceEpoch ~/ 1000,
-    );
+
+    // If we already have some fragments, request only what's missing.
+    final missing = imageProvider.missingFragmentIndices(envelope.sessionId);
+    final isPartialResume =
+        missing.isNotEmpty && missing.length < envelope.total;
+    final request = isPartialResume
+        ? ImageFetchRequest(
+            sessionId: envelope.sessionId,
+            want: 'missing',
+            missingIndices: missing,
+            requesterKey6: requesterKey6,
+            timestampSec: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+          )
+        : ImageFetchRequest(
+            sessionId: envelope.sessionId,
+            requesterKey6: requesterKey6,
+            timestampSec: DateTime.now().millisecondsSinceEpoch ~/ 1000,
+          );
 
     setState(() {
       _isRequesting = true;
@@ -211,7 +285,31 @@ class _ImageMessageBubbleState extends State<ImageMessageBubble> {
         _isRequesting = false;
         _errorText = 'Image unavailable right now';
       });
+      return;
     }
+
+    // Timeout = 2× estimated LoRa airtime (min 30s).
+    final txEstimate = estimateImageTransmitDuration(
+      fragmentCount: missing.isEmpty ? envelope.total : missing.length,
+      sizeBytes: missing.isEmpty
+          ? envelope.sizeBytes
+          : (envelope.sizeBytes * missing.length / envelope.total).round(),
+      pathLen: pathLen,
+      radioBw: radioBw,
+      radioSf: radioSf,
+      radioCr: radioCr,
+    );
+    _requestTimeoutTimer?.cancel();
+    _requestTimeoutTimer = TransferTimeout.start(
+      txEstimate: txEstimate,
+      onTimeout: () {
+        if (mounted &&
+            _isRequesting &&
+            !imageProvider.isComplete(envelope.sessionId)) {
+          setState(() => _isRequesting = false);
+        }
+      },
+    );
   }
 
   Contact? _resolveSender(ImageEnvelope envelope) {
@@ -223,7 +321,45 @@ class _ImageMessageBubbleState extends State<ImageMessageBubble> {
       );
       if (c != null) return c;
     }
-    return contactsProvider.findContactByPrefixHex(envelope.senderKey6);
+    final contact = contactsProvider.findContactByPrefixHex(
+      envelope.senderKey6,
+    );
+    if (contact != null) return contact;
+
+    final senderName = widget.message.senderName?.trim();
+    if (senderName != null && senderName.isNotEmpty) {
+      for (final c in contactsProvider.contacts) {
+        if (c.advName.trim().toLowerCase() == senderName.toLowerCase()) {
+          return c;
+        }
+      }
+    }
+
+    return null;
+  }
+
+  void _showToast(String message) {
+    if (!mounted) return;
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(content: Text(message), duration: const Duration(seconds: 3)),
+    );
+  }
+
+  Future<void> _showBlockingAlert(String title, String message) async {
+    if (!mounted) return;
+    await showDialog<void>(
+      context: context,
+      builder: (dialogContext) => AlertDialog(
+        title: Text(title),
+        content: Text(message),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(dialogContext).pop(),
+            child: const Text('OK'),
+          ),
+        ],
+      ),
+    );
   }
 
   static String _statusText({

lib/widgets/messages/message_bubble.dart

@@ -15,6 +15,7 @@ import '../../providers/voice_provider.dart';
 import '../../providers/image_provider.dart' as ip;
 import '../contacts/direct_message_sheet.dart';
 import '../drawing_minimap_preview.dart';
+import '../../models/ble_packet_log.dart';
 import '../../services/sar_template_service.dart';
 import '../../utils/toast_logger.dart';
 import '../../utils/sar_message_parser.dart';
@@ -25,6 +26,7 @@ import '../../l10n/app_localizations.dart';
 import '../../utils/message_extensions.dart';
 import 'voice_message_bubble.dart';
 import 'image_message_bubble.dart';
+import 'message_trace_sheet.dart';
 
 /// Reusable message bubble widget that displays messages with various types:
 /// - Regular text messages (channel or direct)
@@ -56,10 +58,17 @@ class MessageBubble extends StatefulWidget {
 
 class _MessageBubbleState extends State<MessageBubble> {
   bool _isExpanded = false;
+  bool _showReceivedStats = false;
 
   @override
   void didUpdateWidget(MessageBubble oldWidget) {
     super.didUpdateWidget(oldWidget);
+    if (oldWidget.message.id != widget.message.id) {
+      _isExpanded = false;
+      _showReceivedStats = false;
+      return;
+    }
+
     // Force rebuild when message properties change (especially recipient statuses)
     if (oldWidget.message.id == widget.message.id) {
       // Same message, but properties might have changed
@@ -75,6 +84,15 @@ class _MessageBubbleState extends State<MessageBubble> {
     });
   }
 
+  void _handleBubbleTap({required bool isSarMarker, required bool isDrawing}) {
+    if (!widget.isCompact && !isSarMarker && !isDrawing) {
+      setState(() {
+        _showReceivedStats = !_showReceivedStats;
+      });
+    }
+    widget.onTap?.call();
+  }
+
   Future<void> _retryFailedMessage(
     BuildContext context,
     Message failedMessage,
@@ -278,6 +296,17 @@ class _MessageBubbleState extends State<MessageBubble> {
                 _showTechnicalDetails(context);
               },
             ),
+            if (!isOwnMessage &&
+                widget.message.pathLen > 0 &&
+                widget.message.pathLen < 255)
+              ListTile(
+                leading: const Icon(Icons.route),
+                title: const Text('Trace'),
+                onTap: () {
+                  Navigator.pop(context);
+                  _showTraceSheet(context);
+                },
+              ),
             // Delete message option
             ListTile(
               leading: const Icon(Icons.delete, color: Colors.red),
@@ -296,6 +325,18 @@ class _MessageBubbleState extends State<MessageBubble> {
     );
   }
 
+  void _showTraceSheet(BuildContext context) {
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      backgroundColor: Theme.of(context).colorScheme.surface,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
+      ),
+      builder: (context) => MessageTraceSheet(message: widget.message),
+    );
+  }
+
   void _showTechnicalDetails(BuildContext context) {
     final connectionProvider = context.read<ConnectionProvider>();
     final radioBw = connectionProvider.deviceInfo.radioBw;
@@ -401,9 +442,21 @@ class _MessageBubbleState extends State<MessageBubble> {
         ?.sublist(0, recipientKey.length < 6 ? recipientKey.length : 6)
         .map((b) => b.toRadixString(16).padLeft(2, '0'))
         .join('');
-    final snrDb = widget.message.lastEchoSnrRaw != null
-        ? (widget.message.lastEchoSnrRaw!.toSigned(8) / 4.0)
-        : null;
+    final matchedRxLog = _findBestMatchingRxLog(
+      connectionProvider.bleService.packetLogs,
+      widget.message,
+    );
+    final packetPathBytes = _extractPathBytesFromLog(matchedRxLog);
+    final packetPathHex = packetPathBytes
+        ?.map((b) => b.toRadixString(16).padLeft(2, '0'))
+        .join(':');
+    final snrDb =
+        matchedRxLog?.logRxDataInfo?.snrDb ??
+        (widget.message.lastEchoSnrRaw != null
+            ? (widget.message.lastEchoSnrRaw!.toSigned(8) / 4.0)
+            : null);
+    final rssiDbm =
+        matchedRxLog?.logRxDataInfo?.rssiDbm ?? widget.message.lastEchoRssiDbm;
 
     final rawLines = <String>[
       'Message ID: ${widget.message.id}',
@@ -415,11 +468,14 @@ class _MessageBubbleState extends State<MessageBubble> {
       'Status: ${widget.message.deliveryStatus.name}',
       'Path length (nodes/hops): ${widget.message.pathLen}',
       'Sender timestamp: ${widget.message.senderTimestamp} (${widget.message.sentAt.toIso8601String()})',
-      'Received at: ${widget.message.receivedAt.toIso8601String()}',
+      'Received at (RFC3339): ${_formatRfc3339(widget.message.receivedAt)}',
       'Channel index: ${widget.message.channelIdx ?? '-'}',
       'Echo count: ${widget.message.echoCount}',
       'Last echo RSSI: ${widget.message.lastEchoRssiDbm ?? '-'}',
       'Last echo SNR: ${snrDb?.toStringAsFixed(2) ?? '-'}',
+      'Matched RX RSSI: ${rssiDbm ?? '-'}',
+      'Matched RX SNR: ${snrDb?.toStringAsFixed(2) ?? '-'}',
+      'Matched path bytes: ${packetPathHex ?? '-'}',
       'Expected ACK tag: ${widget.message.expectedAckTag ?? '-'}',
       'Suggested timeout ms: ${widget.message.suggestedTimeoutMs ?? '-'}',
       'Round-trip ms: ${widget.message.roundTripTimeMs ?? '-'}',
@@ -527,304 +583,357 @@ class _MessageBubbleState extends State<MessageBubble> {
       ToastLogger.success(context, l10n.textCopiedToClipboard);
     }
 
-    showDialog(
+    showModalBottomSheet(
       context: context,
-      builder: (context) => AlertDialog(
-        title: Text(l10n.messageTechnicalDetails),
-        content: SizedBox(
-          width: double.maxFinite,
-          child: SingleChildScrollView(
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.stretch,
-              children: [
-                Wrap(
-                  spacing: 8,
-                  runSpacing: 8,
+      isScrollControlled: true,
+      backgroundColor: Theme.of(context).colorScheme.surface,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
+      ),
+      builder: (sheetContext) => SafeArea(
+        child: SizedBox(
+          height: MediaQuery.of(sheetContext).size.height * 0.85,
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              Padding(
+                padding: const EdgeInsets.fromLTRB(16, 14, 8, 8),
+                child: Row(
                   children: [
-                    _techBadge(
-                      context,
-                      icon: Icons.message,
-                      label: widget.message.messageType.name.toUpperCase(),
-                    ),
-                    _techBadge(
-                      context,
-                      icon: Icons.route,
-                      label:
-                          '${widget.message.pathLen} hop${widget.message.pathLen == 1 ? '' : 's'}',
-                    ),
-                    _techBadge(
-                      context,
-                      icon: Icons.account_tree_outlined,
-                      label:
-                          '${widget.message.echoCount} node${widget.message.echoCount == 1 ? '' : 's'}',
-                    ),
-                    if (widget.message.channelIdx != null)
-                      _techBadge(
-                        context,
-                        icon: Icons.group_work,
-                        label: 'CH ${widget.message.channelIdx}',
+                    Expanded(
+                      child: Text(
+                        l10n.messageTechnicalDetails,
+                        style: Theme.of(sheetContext).textTheme.titleLarge,
                       ),
+                    ),
+                    IconButton(
+                      onPressed: () => Navigator.pop(sheetContext),
+                      icon: const Icon(Icons.close),
+                      tooltip: l10n.close,
+                    ),
                   ],
                 ),
-                if (widget.message.lastEchoRssiDbm != null ||
-                    snrDb != null) ...[
-                  const SizedBox(height: 12),
-                  _techSection(
-                    context,
-                    icon: Icons.network_check,
-                    title: l10n.linkQuality,
-                    child: Column(
-                      children: [
-                        if (widget.message.lastEchoRssiDbm != null)
-                          _signalRow(
+              ),
+              Expanded(
+                child: SingleChildScrollView(
+                  padding: const EdgeInsets.symmetric(horizontal: 16),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    children: [
+                      Wrap(
+                        spacing: 8,
+                        runSpacing: 8,
+                        children: [
+                          _techBadge(
                             context,
-                            label: 'RSSI',
-                            valueLabel: '${widget.message.lastEchoRssiDbm} dBm',
-                            normalized:
-                                ((widget.message.lastEchoRssiDbm!.toDouble() +
-                                            120.0) /
-                                        70.0)
-                                    .clamp(0.0, 1.0),
-                            color: widget.message.lastEchoRssiDbm! >= -80
-                                ? Colors.green
-                                : widget.message.lastEchoRssiDbm! >= -95
-                                ? Colors.amber
-                                : Colors.redAccent,
+                            icon: Icons.message,
+                            label: widget.message.messageType.name
+                                .toUpperCase(),
                           ),
-                        if (snrDb != null) ...[
-                          const SizedBox(height: 8),
-                          _signalRow(
+                          _techBadge(
                             context,
-                            label: 'SNR',
-                            valueLabel: '${snrDb.toStringAsFixed(1)} dB',
-                            normalized: ((snrDb + 20.0) / 40.0).clamp(0.0, 1.0),
-                            color: snrDb >= 10
-                                ? Colors.green
-                                : snrDb >= 0
-                                ? Colors.amber
-                                : Colors.redAccent,
+                            icon: Icons.route,
+                            label:
+                                '${widget.message.pathLen} hop${widget.message.pathLen == 1 ? '' : 's'}',
+                          ),
+                          _techBadge(
+                            context,
+                            icon: Icons.account_tree_outlined,
+                            label:
+                                '${widget.message.echoCount} node${widget.message.echoCount == 1 ? '' : 's'}',
+                          ),
+                          if (widget.message.channelIdx != null)
+                            _techBadge(
+                              context,
+                              icon: Icons.group_work,
+                              label: 'CH ${widget.message.channelIdx}',
+                            ),
+                        ],
+                      ),
+                      if (widget.message.lastEchoRssiDbm != null ||
+                          snrDb != null ||
+                          rssiDbm != null) ...[
+                        const SizedBox(height: 12),
+                        _techSection(
+                          context,
+                          icon: Icons.network_check,
+                          title: l10n.linkQuality,
+                          child: Column(
+                            children: [
+                              if (rssiDbm != null)
+                                _signalRow(
+                                  context,
+                                  label: 'RSSI',
+                                  valueLabel: '$rssiDbm dBm',
+                                  normalized:
+                                      ((rssiDbm.toDouble() + 120.0) / 70.0)
+                                          .clamp(0.0, 1.0),
+                                  color: rssiDbm >= -80
+                                      ? Colors.green
+                                      : rssiDbm >= -95
+                                      ? Colors.amber
+                                      : Colors.redAccent,
+                                ),
+                              if (snrDb != null) ...[
+                                const SizedBox(height: 8),
+                                _signalRow(
+                                  context,
+                                  label: 'SNR',
+                                  valueLabel: '${snrDb.toStringAsFixed(1)} dB',
+                                  normalized: ((snrDb + 20.0) / 40.0).clamp(
+                                    0.0,
+                                    1.0,
+                                  ),
+                                  color: snrDb >= 10
+                                      ? Colors.green
+                                      : snrDb >= 0
+                                      ? Colors.amber
+                                      : Colors.redAccent,
+                                ),
+                              ],
+                            ],
+                          ),
+                        ),
+                      ],
+                      const SizedBox(height: 12),
+                      _techSection(
+                        context,
+                        icon: Icons.tune,
+                        title: l10n.delivery,
+                        child: Column(
+                          children: [
+                            _detailRow(
+                              context,
+                              label: l10n.status,
+                              value: widget.message.deliveryStatus.name,
+                            ),
+                            _detailRow(
+                              context,
+                              label: 'Received (RFC3339)',
+                              value: _formatRfc3339(widget.message.receivedAt),
+                              onCopy: () => copyField(
+                                _formatRfc3339(widget.message.receivedAt),
+                              ),
+                            ),
+                            if (widget.message.expectedAckTag != null)
+                              _detailRow(
+                                context,
+                                label: l10n.expectedAckTag,
+                                value: widget.message.expectedAckTag!
+                                    .toString(),
+                              ),
+                            if (widget.message.roundTripTimeMs != null)
+                              _detailRow(
+                                context,
+                                label: l10n.roundTrip,
+                                value: '${widget.message.roundTripTimeMs} ms',
+                              ),
+                            if (widget.message.retryAttempt > 0)
+                              _detailRow(
+                                context,
+                                label: l10n.retryAttempt,
+                                value: widget.message.retryAttempt.toString(),
+                              ),
+                            if (widget.message.usedFloodFallback)
+                              _detailRow(
+                                context,
+                                label: l10n.floodFallback,
+                                value: l10n.yes,
+                              ),
+                            if (packetPathHex != null)
+                              _detailRow(
+                                context,
+                                label: 'Path bytes',
+                                value: packetPathHex,
+                                onCopy: () => copyField(packetPathHex),
+                              ),
+                          ],
+                        ),
+                      ),
+                      const SizedBox(height: 12),
+                      _techSection(
+                        context,
+                        icon: Icons.badge,
+                        title: l10n.identity,
+                        child: Column(
+                          children: [
+                            _detailRow(
+                              context,
+                              label: l10n.messageId,
+                              value: widget.message.id,
+                              onCopy: () => copyField(widget.message.id),
+                            ),
+                            _detailRow(
+                              context,
+                              label: l10n.sender,
+                              value:
+                                  senderName ??
+                                  widget.message.senderName ??
+                                  'Unknown',
+                            ),
+                            if (senderPrefixHex != null)
+                              _detailRow(
+                                context,
+                                label: l10n.senderKey,
+                                value: senderPrefixHex,
+                                onCopy: () => copyField(senderPrefixHex),
+                              ),
+                            if (recipientName != null)
+                              _detailRow(
+                                context,
+                                label: l10n.recipient,
+                                value: recipientName,
+                              ),
+                            if (recipientPrefixHex != null)
+                              _detailRow(
+                                context,
+                                label: l10n.recipientKey,
+                                value: recipientPrefixHex,
+                                onCopy: () => copyField(recipientPrefixHex),
+                              ),
+                          ],
+                        ),
+                      ),
+                      if (widget.message.isVoice) ...[
+                        const SizedBox(height: 12),
+                        _techSection(
+                          context,
+                          icon: Icons.graphic_eq,
+                          title: l10n.voice,
+                          child: Column(
+                            children: [
+                              _detailRow(
+                                context,
+                                label: l10n.voiceId,
+                                value: widget.message.voiceId ?? '-',
+                              ),
+                              _detailRow(
+                                context,
+                                label: l10n.envelope,
+                                value: envelope != null
+                                    ? 'VE1 compact'
+                                    : legacyVoicePacket != null
+                                    ? 'Legacy V packet'
+                                    : l10n.unknown,
+                              ),
+                              if (voiceSession != null)
+                                _detailRow(
+                                  context,
+                                  label: l10n.sessionProgress,
+                                  value:
+                                      '${voiceSession.receivedCount}/${voiceSession.total} segments',
+                                ),
+                              if (voiceSession != null)
+                                _detailRow(
+                                  context,
+                                  label: l10n.complete,
+                                  value: voiceSession.isComplete
+                                      ? l10n.yes
+                                      : l10n.no,
+                                ),
+                              if (voiceTxEstimate > Duration.zero)
+                                _detailRow(
+                                  context,
+                                  label: 'Estimated tx',
+                                  value: voiceTxEstimate.inSeconds < 60
+                                      ? '~${voiceTxEstimate.inSeconds}s'
+                                      : '~${voiceTxEstimate.inMinutes}m ${voiceTxEstimate.inSeconds % 60}s',
+                                ),
+                            ],
+                          ),
+                        ),
+                      ],
+                      if (imageEnvelope != null) ...[
+                        const SizedBox(height: 12),
+                        _techSection(
+                          context,
+                          icon: Icons.image_outlined,
+                          title: 'Image',
+                          child: Column(
+                            children: [
+                              _detailRow(
+                                context,
+                                label: l10n.envelope,
+                                value: 'IE1',
+                              ),
+                              _detailRow(
+                                context,
+                                label: 'Format',
+                                value: imageEnvelope.format.label,
+                              ),
+                              _detailRow(
+                                context,
+                                label: 'Dimensions',
+                                value:
+                                    '${imageEnvelope.width}×${imageEnvelope.height}',
+                              ),
+                              _detailRow(
+                                context,
+                                label: 'Segments',
+                                value: imageSession != null
+                                    ? '${imageSession.receivedCount}/${imageSession.total}'
+                                    : '${imageEnvelope.total}',
+                              ),
+                              if (imageSession != null)
+                                _detailRow(
+                                  context,
+                                  label: l10n.complete,
+                                  value: imageSession.isComplete
+                                      ? l10n.yes
+                                      : l10n.no,
+                                ),
+                              if (imageTxEstimate > Duration.zero)
+                                _detailRow(
+                                  context,
+                                  label: 'Estimated tx',
+                                  value: imageTxEstimate.inSeconds < 60
+                                      ? '~${imageTxEstimate.inSeconds}s'
+                                      : '~${imageTxEstimate.inMinutes}m ${imageTxEstimate.inSeconds % 60}s',
+                                ),
+                            ],
+                          ),
+                        ),
+                      ],
+                      const SizedBox(height: 8),
+                      ExpansionTile(
+                        tilePadding: EdgeInsets.zero,
+                        dense: true,
+                        visualDensity: VisualDensity.compact,
+                        title: Text(
+                          l10n.rawDump,
+                          style: const TextStyle(
+                            fontSize: 12,
+                            fontWeight: FontWeight.w600,
+                          ),
+                        ),
+                        children: [
+                          Container(
+                            width: double.infinity,
+                            padding: const EdgeInsets.all(10),
+                            decoration: BoxDecoration(
+                              color: Theme.of(context)
+                                  .colorScheme
+                                  .surfaceContainerHighest
+                                  .withValues(alpha: 0.35),
+                              borderRadius: BorderRadius.circular(8),
+                            ),
+                            child: SelectableText(
+                              rawLines.join('\n'),
+                              style: const TextStyle(
+                                fontFamily: 'monospace',
+                                fontSize: 12,
+                              ),
+                            ),
                           ),
                         ],
-                      ],
-                    ),
-                  ),
-                ],
-                const SizedBox(height: 12),
-                _techSection(
-                  context,
-                  icon: Icons.tune,
-                  title: l10n.delivery,
-                  child: Column(
-                    children: [
-                      _detailRow(
-                        context,
-                        label: l10n.status,
-                        value: widget.message.deliveryStatus.name,
-                      ),
-                      _detailRow(
-                        context,
-                        label: l10n.expectedAckTag,
-                        value: widget.message.expectedAckTag?.toString() ?? '-',
-                      ),
-                      _detailRow(
-                        context,
-                        label: l10n.roundTrip,
-                        value: widget.message.roundTripTimeMs != null
-                            ? '${widget.message.roundTripTimeMs} ms'
-                            : '-',
-                      ),
-                      _detailRow(
-                        context,
-                        label: l10n.retryAttempt,
-                        value: widget.message.retryAttempt.toString(),
-                      ),
-                      _detailRow(
-                        context,
-                        label: l10n.floodFallback,
-                        value: widget.message.usedFloodFallback
-                            ? l10n.yes
-                            : l10n.no,
                       ),
                     ],
                   ),
                 ),
-                const SizedBox(height: 12),
-                _techSection(
-                  context,
-                  icon: Icons.badge,
-                  title: l10n.identity,
-                  child: Column(
-                    children: [
-                      _detailRow(
-                        context,
-                        label: l10n.messageId,
-                        value: widget.message.id,
-                        onCopy: () => copyField(widget.message.id),
-                      ),
-                      _detailRow(
-                        context,
-                        label: l10n.sender,
-                        value: senderName ?? widget.message.senderName ?? '-',
-                      ),
-                      _detailRow(
-                        context,
-                        label: l10n.senderKey,
-                        value: senderPrefixHex ?? '-',
-                        onCopy: senderPrefixHex != null
-                            ? () => copyField(senderPrefixHex)
-                            : null,
-                      ),
-                      _detailRow(
-                        context,
-                        label: l10n.recipient,
-                        value: recipientName ?? '-',
-                      ),
-                      _detailRow(
-                        context,
-                        label: l10n.recipientKey,
-                        value: recipientPrefixHex ?? '-',
-                        onCopy: recipientPrefixHex != null
-                            ? () => copyField(recipientPrefixHex)
-                            : null,
-                      ),
-                    ],
-                  ),
-                ),
-                if (widget.message.isVoice) ...[
-                  const SizedBox(height: 12),
-                  _techSection(
-                    context,
-                    icon: Icons.graphic_eq,
-                    title: l10n.voice,
-                    child: Column(
-                      children: [
-                        _detailRow(
-                          context,
-                          label: l10n.voiceId,
-                          value: widget.message.voiceId ?? '-',
-                        ),
-                        _detailRow(
-                          context,
-                          label: l10n.envelope,
-                          value: envelope != null
-                              ? 'VE1 compact'
-                              : legacyVoicePacket != null
-                              ? 'Legacy V packet'
-                              : l10n.unknown,
-                        ),
-                        if (voiceSession != null)
-                          _detailRow(
-                            context,
-                            label: l10n.sessionProgress,
-                            value:
-                                '${voiceSession.receivedCount}/${voiceSession.total} segments',
-                          ),
-                        if (voiceSession != null)
-                          _detailRow(
-                            context,
-                            label: l10n.complete,
-                            value: voiceSession.isComplete ? l10n.yes : l10n.no,
-                          ),
-                        if (voiceTxEstimate > Duration.zero)
-                          _detailRow(
-                            context,
-                            label: 'Estimated tx',
-                            value: voiceTxEstimate.inSeconds < 60
-                                ? '~${voiceTxEstimate.inSeconds}s'
-                                : '~${voiceTxEstimate.inMinutes}m ${voiceTxEstimate.inSeconds % 60}s',
-                          ),
-                      ],
-                    ),
-                  ),
-                ],
-                if (imageEnvelope != null) ...[
-                  const SizedBox(height: 12),
-                  _techSection(
-                    context,
-                    icon: Icons.image_outlined,
-                    title: 'Image',
-                    child: Column(
-                      children: [
-                        _detailRow(context, label: l10n.envelope, value: 'IE1'),
-                        _detailRow(
-                          context,
-                          label: 'Format',
-                          value: imageEnvelope.format.label,
-                        ),
-                        _detailRow(
-                          context,
-                          label: 'Dimensions',
-                          value:
-                              '${imageEnvelope.width}×${imageEnvelope.height}',
-                        ),
-                        _detailRow(
-                          context,
-                          label: 'Segments',
-                          value: imageSession != null
-                              ? '${imageSession.receivedCount}/${imageSession.total}'
-                              : '${imageEnvelope.total}',
-                        ),
-                        if (imageSession != null)
-                          _detailRow(
-                            context,
-                            label: l10n.complete,
-                            value: imageSession.isComplete ? l10n.yes : l10n.no,
-                          ),
-                        if (imageTxEstimate > Duration.zero)
-                          _detailRow(
-                            context,
-                            label: 'Estimated tx',
-                            value: imageTxEstimate.inSeconds < 60
-                                ? '~${imageTxEstimate.inSeconds}s'
-                                : '~${imageTxEstimate.inMinutes}m ${imageTxEstimate.inSeconds % 60}s',
-                          ),
-                      ],
-                    ),
-                  ),
-                ],
-                const SizedBox(height: 8),
-                ExpansionTile(
-                  tilePadding: EdgeInsets.zero,
-                  dense: true,
-                  visualDensity: VisualDensity.compact,
-                  title: Text(
-                    l10n.rawDump,
-                    style: const TextStyle(
-                      fontSize: 12,
-                      fontWeight: FontWeight.w600,
-                    ),
-                  ),
-                  children: [
-                    Container(
-                      width: double.infinity,
-                      padding: const EdgeInsets.all(10),
-                      decoration: BoxDecoration(
-                        color: Theme.of(context)
-                            .colorScheme
-                            .surfaceContainerHighest
-                            .withValues(alpha: 0.35),
-                        borderRadius: BorderRadius.circular(8),
-                      ),
-                      child: SelectableText(
-                        rawLines.join('\n'),
-                        style: const TextStyle(
-                          fontFamily: 'monospace',
-                          fontSize: 12,
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ],
-            ),
+              ),
+            ],
           ),
         ),
-        actions: [
-          TextButton(
-            onPressed: () => Navigator.pop(context),
-            child: Text(AppLocalizations.of(context)!.close),
-          ),
-        ],
       ),
     );
   }
@@ -972,6 +1081,64 @@ class _MessageBubbleState extends State<MessageBubble> {
     );
   }
 
+  String _formatRfc3339(DateTime dateTime) {
+    final utc = dateTime.toUtc();
+    String two(int v) => v.toString().padLeft(2, '0');
+    String four(int v) => v.toString().padLeft(4, '0');
+    final fraction = utc.millisecond == 0
+        ? ''
+        : '.${utc.millisecond.toString().padLeft(3, '0')}';
+
+    return '${four(utc.year)}-${two(utc.month)}-${two(utc.day)}'
+        'T${two(utc.hour)}:${two(utc.minute)}:${two(utc.second)}'
+        '${fraction}Z';
+  }
+
+  BlePacketLog? _findBestMatchingRxLog(
+    List<BlePacketLog> logs,
+    Message message,
+  ) {
+    if (message.pathLen < 0 || message.pathLen >= 255) return null;
+    final expectedPayloadType = message.messageType == MessageType.channel
+        ? 0x05
+        : 0x02;
+    BlePacketLog? bestLog;
+    var bestDeltaMs = 999999999;
+
+    for (final log in logs) {
+      if (log.responseCode != 0x88) continue; // pushLogRxData
+      if (log.rawData.length < 6) continue;
+
+      // Logged frame format:
+      // [0]=response code 0x88, [1]=snrRaw, [2]=rssi, [3]=packet header, [4]=pathLen
+      final raw = log.rawData;
+      final payloadType = (raw[3] >> 2) & 0x0F;
+      final pathLen = raw[4];
+      if (payloadType != expectedPayloadType) continue;
+      if (pathLen != message.pathLen) continue;
+      if (raw.length < 5 + pathLen) continue;
+
+      final deltaMs =
+          (log.timestamp.difference(message.receivedAt).inMilliseconds).abs();
+      if (deltaMs < bestDeltaMs) {
+        bestDeltaMs = deltaMs;
+        bestLog = log;
+      }
+    }
+
+    if (bestDeltaMs > 30000) return null;
+    return bestLog;
+  }
+
+  List<int>? _extractPathBytesFromLog(BlePacketLog? log) {
+    if (log == null) return null;
+    final raw = log.rawData;
+    if (raw.length < 6) return null;
+    final pathLen = raw[4];
+    if (pathLen <= 0 || raw.length < 5 + pathLen) return null;
+    return raw.sublist(5, 5 + pathLen);
+  }
+
   void _showReplySheet(BuildContext context) {
     // Find the sender contact by public key prefix
     final contactsProvider = context.read<ContactsProvider>();
@@ -1352,6 +1519,55 @@ class _MessageBubbleState extends State<MessageBubble> {
     );
   }
 
+  Widget _buildReceivedSignalStatus(
+    BuildContext context,
+    Message message, {
+    required int? rssiDbm,
+    required double? snrDb,
+  }) {
+    final hopLabel = message.pathLen == 0
+        ? 'Direct'
+        : '${message.pathLen} hop${message.pathLen == 1 ? '' : 's'}';
+
+    return Wrap(
+      spacing: 4,
+      runSpacing: 4,
+      crossAxisAlignment: WrapCrossAlignment.center,
+      children: [
+        _techChip(
+          context,
+          icon: Icons.alt_route,
+          label: hopLabel,
+          color: Colors.indigo,
+        ),
+        if (rssiDbm != null || snrDb != null) ...[
+          _techChip(
+            context,
+            icon: Icons.bolt,
+            label: _linkQualityLabel(rssiDbm, snrDb),
+            color: _linkQualityColor(_linkQualityLabel(rssiDbm, snrDb)),
+          ),
+          if (rssiDbm != null)
+            _signalCapsule(
+              context,
+              icon: Icons.network_cell,
+              label: '$rssiDbm',
+              filled: _rssiScore(rssiDbm),
+              color: Colors.blueGrey,
+            ),
+          if (snrDb != null)
+            _signalCapsule(
+              context,
+              icon: Icons.graphic_eq,
+              label: snrDb.toStringAsFixed(1),
+              filled: _snrScore(snrDb),
+              color: Colors.teal,
+            ),
+        ],
+      ],
+    );
+  }
+
   Widget _techChip(
     BuildContext context, {
     required IconData icon,
@@ -1472,6 +1688,19 @@ class _MessageBubbleState extends State<MessageBubble> {
     final selfPublicKey = connectionProvider.deviceInfo.publicKey;
     final isOwnMessage =
         message.isSentMessage || message.isFromSelf(selfPublicKey);
+    final matchedRxLog = !isOwnMessage
+        ? _findBestMatchingRxLog(
+            connectionProvider.bleService.packetLogs,
+            message,
+          )
+        : null;
+    final snrDb =
+        matchedRxLog?.logRxDataInfo?.snrDb ??
+        (message.lastEchoSnrRaw != null
+            ? (message.lastEchoSnrRaw!.toSigned(8) / 4.0)
+            : null);
+    final rssiDbm =
+        matchedRxLog?.logRxDataInfo?.rssiDbm ?? message.lastEchoRssiDbm;
 
     // Look up contact information for rich display name
     final contactsProvider = context.read<ContactsProvider>();
@@ -1547,7 +1776,10 @@ class _MessageBubbleState extends State<MessageBubble> {
         : recipientDisplayName;
 
     return GestureDetector(
-      onTap: widget.onTap,
+      onTap: () => _handleBubbleTap(
+        isSarMarker: isSarMarker,
+        isDrawing: message.isDrawing,
+      ),
       onLongPress: widget.isCompact ? null : () => _showMessageOptions(context),
       child: Container(
         margin: const EdgeInsets.only(bottom: 8),
@@ -1952,6 +2184,19 @@ class _MessageBubbleState extends State<MessageBubble> {
             else if (!message.isDrawing || widget.isCompact)
               Text(message.text, style: Theme.of(context).textTheme.bodyMedium),
 
+            if (!widget.isCompact &&
+                !isSarMarker &&
+                !message.isDrawing &&
+                _showReceivedStats) ...[
+              const SizedBox(height: 6),
+              _buildReceivedSignalStatus(
+                context,
+                message,
+                rssiDbm: rssiDbm,
+                snrDb: snrDb,
+              ),
+            ],
+
             // Delivery status for sent messages (skip in compact mode)
             if (message.isSentMessage && !widget.isCompact) ...[
               const SizedBox(height: 6),

lib/widgets/messages/message_trace_sheet.dart

@@ -0,0 +1,436 @@
+// ignore_for_file: use_null_aware_elements
+
+import 'dart:math' as math;
+import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart' as flutter_map;
+import 'package:latlong2/latlong.dart';
+import 'package:provider/provider.dart';
+import '../../models/ble_packet_log.dart';
+import '../../models/message.dart';
+import '../../providers/connection_provider.dart';
+import '../../services/mesh_map_nodes_service.dart';
+
+class MessageTraceSheet extends StatefulWidget {
+  final Message message;
+
+  const MessageTraceSheet({super.key, required this.message});
+
+  @override
+  State<MessageTraceSheet> createState() => _MessageTraceSheetState();
+}
+
+class _MessageTraceSheetState extends State<MessageTraceSheet> {
+  late final Future<_TraceResult> _future;
+
+  @override
+  void initState() {
+    super.initState();
+    _future = _loadTrace();
+  }
+
+  Future<_TraceResult> _loadTrace() async {
+    final connectionProvider = context.read<ConnectionProvider>();
+    final nodes = await MeshMapNodesService.fetchNodes();
+    final packetPath = _extractPathFromPacketLogs(
+      logs: connectionProvider.bleService.packetLogs,
+      message: widget.message,
+    );
+
+    final senderPrefix = _toPrefixHex(widget.message.senderPublicKeyPrefix);
+    final recipientPrefix = widget.message.recipientPublicKey != null
+        ? _toPrefixHex(widget.message.recipientPublicKey)
+        : _toPrefixHex(connectionProvider.deviceInfo.publicKey);
+
+    final senderNode = _bestNodeForPrefix(nodes, senderPrefix);
+    final recipientNode = _bestNodeForPrefix(nodes, recipientPrefix);
+
+    if (packetPath != null && packetPath.isNotEmpty) {
+      final matched = _matchNodesFromPathHashes(
+        nodes: nodes,
+        pathHashes: packetPath,
+        senderPrefix: senderPrefix,
+        recipientPrefix: recipientPrefix,
+      );
+      return _TraceResult(
+        mode: TraceMode.packetPath,
+        sender: senderNode,
+        recipient: recipientNode,
+        pathHashes: packetPath,
+        matchedPathNodes: matched,
+      );
+    }
+
+    // Fallback when packet path is unavailable.
+    final inferred = _inferRelaysFromHopCount(
+      nodes: nodes,
+      sender: senderNode,
+      recipient: recipientNode,
+      relayCount: math.max(0, widget.message.pathLen),
+    );
+    final matchedPathNodes = <MeshMapNode?>[
+      if (senderNode != null) senderNode,
+      ...inferred,
+      if (recipientNode != null) recipientNode,
+    ];
+
+    return _TraceResult(
+      mode: TraceMode.hopCountInference,
+      sender: senderNode,
+      recipient: recipientNode,
+      pathHashes: const [],
+      matchedPathNodes: matchedPathNodes,
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SafeArea(
+      child: FutureBuilder<_TraceResult>(
+        future: _future,
+        builder: (context, snapshot) {
+          if (snapshot.connectionState != ConnectionState.done) {
+            return const SizedBox(
+              height: 360,
+              child: Center(child: CircularProgressIndicator()),
+            );
+          }
+          if (snapshot.hasError) {
+            return SizedBox(
+              height: 360,
+              child: Center(
+                child: Padding(
+                  padding: const EdgeInsets.all(16),
+                  child: Text('Failed to load trace: ${snapshot.error}'),
+                ),
+              ),
+            );
+          }
+
+          final trace = snapshot.data!;
+          final mapPoints = trace.matchedPathNodes
+              .whereType<MeshMapNode>()
+              .map((n) => LatLng(n.latitude, n.longitude))
+              .toList();
+          final hasMapPath = mapPoints.length >= 2;
+          final relayNodes = _relayNodes(trace.matchedPathNodes);
+
+          return SizedBox(
+            height: MediaQuery.of(context).size.height * 0.75,
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                const SizedBox(height: 12),
+                Center(
+                  child: Container(
+                    width: 40,
+                    height: 4,
+                    decoration: BoxDecoration(
+                      color: Theme.of(context).dividerColor,
+                      borderRadius: BorderRadius.circular(2),
+                    ),
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.fromLTRB(16, 14, 16, 8),
+                  child: Text(
+                    'Trace',
+                    style: Theme.of(context).textTheme.titleLarge,
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 16),
+                  child: Text(
+                    trace.mode == TraceMode.packetPath
+                        ? 'Route from packet path bytes'
+                        : 'Route inferred from hop count (${widget.message.pathLen})',
+                    style: Theme.of(context).textTheme.bodySmall,
+                  ),
+                ),
+                const SizedBox(height: 10),
+                Expanded(
+                  child: ListView(
+                    padding: const EdgeInsets.only(bottom: 16),
+                    children: [
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 16),
+                        child: SizedBox(
+                          height: 240,
+                          child: ClipRRect(
+                            borderRadius: BorderRadius.circular(12),
+                            child: DecoratedBox(
+                              decoration: BoxDecoration(
+                                border: Border.all(
+                                  color: Theme.of(context).dividerColor,
+                                ),
+                              ),
+                              child: hasMapPath
+                                  ? flutter_map.FlutterMap(
+                                      options: flutter_map.MapOptions(
+                                        initialCameraFit: flutter_map.CameraFit.bounds(
+                                          bounds: flutter_map.LatLngBounds.fromPoints(mapPoints),
+                                          padding: const EdgeInsets.all(28),
+                                        ),
+                                      ),
+                                      children: [
+                                        flutter_map.TileLayer(
+                                          urlTemplate:
+                                              'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+                                          userAgentPackageName: 'com.meshcore.sar',
+                                        ),
+                                        flutter_map.PolylineLayer(
+                                          polylines: [
+                                            flutter_map.Polyline(
+                                              points: mapPoints,
+                                              strokeWidth: 4,
+                                              color: Theme.of(context).colorScheme.primary,
+                                            ),
+                                          ],
+                                        ),
+                                        flutter_map.MarkerLayer(
+                                          markers: trace.matchedPathNodes
+                                              .whereType<MeshMapNode>()
+                                              .toList()
+                                              .asMap()
+                                              .entries
+                                              .map(
+                                                (entry) => flutter_map.Marker(
+                                                  point: LatLng(
+                                                    entry.value.latitude,
+                                                    entry.value.longitude,
+                                                  ),
+                                                  width: 34,
+                                                  height: 34,
+                                                  child: CircleAvatar(
+                                                    radius: 16,
+                                                    backgroundColor: entry.key == 0
+                                                        ? Colors.green
+                                                        : (entry.key ==
+                                                                  trace
+                                                                          .matchedPathNodes
+                                                                          .whereType<MeshMapNode>()
+                                                                          .length -
+                                                                      1
+                                                              ? Colors.red
+                                                              : Colors.blue),
+                                                    child: Text(
+                                                      '${entry.key + 1}',
+                                                      style: const TextStyle(
+                                                        color: Colors.white,
+                                                        fontWeight: FontWeight.bold,
+                                                        fontSize: 11,
+                                                      ),
+                                                    ),
+                                                  ),
+                                                ),
+                                              )
+                                              .toList(),
+                                        ),
+                                      ],
+                                    )
+                                  : const Center(
+                                      child: Text('Not enough geolocated nodes to draw path'),
+                                    ),
+                            ),
+                          ),
+                        ),
+                      ),
+                      const SizedBox(height: 12),
+                      Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 16),
+                        child: Text(
+                          'Relays (${relayNodes.length})',
+                          style: Theme.of(context).textTheme.titleMedium,
+                        ),
+                      ),
+                      if (relayNodes.isEmpty)
+                        const Padding(
+                          padding: EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+                          child: Text('No relay nodes could be matched for this message.'),
+                        ),
+                      ...relayNodes.map(
+                        (node) => ListTile(
+                          leading: const Icon(Icons.router),
+                          title: Text(node.name),
+                          subtitle: Text(
+                            '${node.publicKey.substring(0, math.min(12, node.publicKey.length))} • '
+                            '${node.latitude.toStringAsFixed(5)}, ${node.longitude.toStringAsFixed(5)}',
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  List<MeshMapNode> _relayNodes(List<MeshMapNode?> path) {
+    final concrete = path.whereType<MeshMapNode>().toList();
+    if (concrete.length <= 2) return const [];
+    return concrete.sublist(1, concrete.length - 1);
+  }
+
+  String? _toPrefixHex(List<int>? key) {
+    if (key == null || key.isEmpty) return null;
+    final take = key.length < 6 ? key.length : 6;
+    return key
+        .take(take)
+        .map((b) => b.toRadixString(16).padLeft(2, '0'))
+        .join()
+        .toLowerCase();
+  }
+
+  MeshMapNode? _bestNodeForPrefix(List<MeshMapNode> nodes, String? prefixHex) {
+    if (prefixHex == null || prefixHex.isEmpty) return null;
+    final matches = nodes
+        .where((n) => n.publicKey.startsWith(prefixHex))
+        .toList()
+      ..sort((a, b) => b.updatedAtMs.compareTo(a.updatedAtMs));
+    return matches.isEmpty ? null : matches.first;
+  }
+
+  List<int>? _extractPathFromPacketLogs({
+    required List<BlePacketLog> logs,
+    required Message message,
+  }) {
+    if (message.pathLen <= 0 || message.pathLen >= 255) return null;
+    final expectedPayloadType = message.messageType == MessageType.channel ? 0x05 : 0x02;
+    BlePacketLog? bestLog;
+    var bestDeltaMs = 999999999;
+
+    for (final log in logs) {
+      if (log.responseCode != 0x88) continue; // pushLogRxData
+      if (log.rawData.length < 6) continue;
+      final raw = log.rawData;
+      final header = raw[3];
+      final payloadType = (header >> 2) & 0x0F;
+      final pathLen = raw[4];
+      if (payloadType != expectedPayloadType) continue;
+      if (pathLen != message.pathLen) continue;
+      if (raw.length < 5 + pathLen) continue;
+
+      final deltaMs = (log.timestamp.difference(message.receivedAt).inMilliseconds).abs();
+      if (deltaMs < bestDeltaMs) {
+        bestDeltaMs = deltaMs;
+        bestLog = log;
+      }
+    }
+
+    if (bestLog == null || bestDeltaMs > 30000) return null;
+    final raw = bestLog.rawData;
+    final pathLen = raw[4];
+    return raw.sublist(5, 5 + pathLen);
+  }
+
+  List<MeshMapNode?> _matchNodesFromPathHashes({
+    required List<MeshMapNode> nodes,
+    required List<int> pathHashes,
+    required String? senderPrefix,
+    required String? recipientPrefix,
+  }) {
+    final result = <MeshMapNode?>[];
+    for (var i = 0; i < pathHashes.length; i++) {
+      final hashHex = pathHashes[i].toRadixString(16).padLeft(2, '0');
+      final candidates = nodes.where((n) => n.publicKey.startsWith(hashHex)).toList();
+      if (candidates.isEmpty) {
+        result.add(null);
+        continue;
+      }
+
+      List<MeshMapNode> filtered = candidates;
+      if (i == 0 && senderPrefix != null) {
+        final senderMatches = filtered.where((n) => n.publicKey.startsWith(senderPrefix)).toList();
+        if (senderMatches.isNotEmpty) filtered = senderMatches;
+      } else if (i == pathHashes.length - 1 && recipientPrefix != null) {
+        final recipientMatches = filtered
+            .where((n) => n.publicKey.startsWith(recipientPrefix))
+            .toList();
+        if (recipientMatches.isNotEmpty) filtered = recipientMatches;
+      }
+
+      filtered.sort((a, b) => b.updatedAtMs.compareTo(a.updatedAtMs));
+      result.add(filtered.first);
+    }
+    return result;
+  }
+
+  List<MeshMapNode> _inferRelaysFromHopCount({
+    required List<MeshMapNode> nodes,
+    required MeshMapNode? sender,
+    required MeshMapNode? recipient,
+    required int relayCount,
+  }) {
+    if (relayCount <= 0 || sender == null || recipient == null) return const [];
+    final candidates = nodes.where((n) {
+      if (sender.publicKey == n.publicKey || recipient.publicKey == n.publicKey) {
+        return false;
+      }
+      return true;
+    }).toList();
+
+    final ranked = candidates
+      ..sort((a, b) {
+        final da = _distanceToSegmentMeters(
+          p: LatLng(a.latitude, a.longitude),
+          a: LatLng(sender.latitude, sender.longitude),
+          b: LatLng(recipient.latitude, recipient.longitude),
+        );
+        final db = _distanceToSegmentMeters(
+          p: LatLng(b.latitude, b.longitude),
+          a: LatLng(sender.latitude, sender.longitude),
+          b: LatLng(recipient.latitude, recipient.longitude),
+        );
+        return da.compareTo(db);
+      });
+
+    return ranked.take(relayCount).toList();
+  }
+
+  double _distanceToSegmentMeters({
+    required LatLng p,
+    required LatLng a,
+    required LatLng b,
+  }) {
+    final ax = a.longitude;
+    final ay = a.latitude;
+    final bx = b.longitude;
+    final by = b.latitude;
+    final px = p.longitude;
+    final py = p.latitude;
+
+    final abx = bx - ax;
+    final aby = by - ay;
+    final apx = px - ax;
+    final apy = py - ay;
+    final ab2 = abx * abx + aby * aby;
+    if (ab2 == 0) {
+      return const Distance().as(LengthUnit.Meter, a, p);
+    }
+    var t = (apx * abx + apy * aby) / ab2;
+    t = t.clamp(0.0, 1.0);
+    final closest = LatLng(ay + aby * t, ax + abx * t);
+    return const Distance().as(LengthUnit.Meter, closest, p);
+  }
+}
+
+enum TraceMode { packetPath, hopCountInference }
+
+class _TraceResult {
+  final TraceMode mode;
+  final MeshMapNode? sender;
+  final MeshMapNode? recipient;
+  final List<int> pathHashes;
+  final List<MeshMapNode?> matchedPathNodes;
+
+  const _TraceResult({
+    required this.mode,
+    required this.sender,
+    required this.recipient,
+    required this.pathHashes,
+    required this.matchedPathNodes,
+  });
+}

lib/widgets/messages/transfer_timeout.dart

@@ -0,0 +1,24 @@
+import 'dart:async';
+
+/// Calculates a transfer timeout as 2× the estimated LoRa airtime,
+/// with a minimum of 30 seconds.
+///
+/// Used by [ImageMessageBubble] and [VoiceMessageBubble] to reset the
+/// "loading" spinner when a transfer stalls, allowing the user to retry.
+class TransferTimeout {
+  static const Duration _minimum = Duration(seconds: 30);
+
+  /// Start a one-shot timer based on [txEstimate] × 2 (min 30s).
+  ///
+  /// [onTimeout] is called on the UI thread when the timer fires.
+  /// Returns the [Timer] so the caller can cancel it (e.g. on dispose or
+  /// when the transfer completes).
+  static Timer start({
+    required Duration txEstimate,
+    required void Function() onTimeout,
+  }) {
+    final timeout = txEstimate * 2;
+    final effective = timeout < _minimum ? _minimum : timeout;
+    return Timer(effective, onTimeout);
+  }
+}

lib/widgets/messages/voice_message_bubble.dart

@@ -1,3 +1,4 @@
+import 'dart:async';
 import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -8,6 +9,7 @@ import '../../providers/connection_provider.dart';
 import '../../providers/contacts_provider.dart';
 import '../../providers/voice_provider.dart';
 import '../../utils/voice_message_parser.dart';
+import 'transfer_timeout.dart';
 
 /// A message bubble that shows a voice recording with play/stop controls.
 class VoiceMessageBubble extends StatefulWidget {
@@ -25,9 +27,17 @@ class VoiceMessageBubble extends StatefulWidget {
 }
 
 class _VoiceMessageBubbleState extends State<VoiceMessageBubble> {
+  static const int _maxFetchHops = 3;
   bool _isRequesting = false;
   bool _autoPlayWhenReady = false;
   String? _errorText;
+  Timer? _requestTimeoutTimer;
+
+  @override
+  void dispose() {
+    _requestTimeoutTimer?.cancel();
+    super.dispose();
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -106,7 +116,14 @@ class _VoiceMessageBubbleState extends State<VoiceMessageBubble> {
                   await voiceProvider.play(voiceId);
                   return;
                 }
-                await _requestAndPlayVoice(voiceId);
+                await _requestAndPlayVoice(
+                  voiceId,
+                  envelope: envelope,
+                  radioBw: radioBw,
+                  radioSf: radioSf,
+                  radioCr: radioCr,
+                  pathLen: widget.message.pathLen,
+                );
               },
               borderRadius: BorderRadius.circular(24),
               child: Container(
@@ -174,18 +191,61 @@ class _VoiceMessageBubbleState extends State<VoiceMessageBubble> {
     );
   }
 
-  Future<void> _requestAndPlayVoice(String sessionId) async {
+  Future<void> _requestAndPlayVoice(
+    String sessionId, {
+    VoiceEnvelope? envelope,
+    int? radioBw,
+    int? radioSf,
+    int? radioCr,
+    int pathLen = 0,
+  }) async {
     if (_isRequesting) return;
-    final sender = _resolveSenderContact();
+    var sender = _resolveSenderContact();
     if (sender == null) {
-      _setUnavailable();
+      final connectionProvider = context.read<ConnectionProvider>();
+      await connectionProvider.getContacts();
+      if (!mounted) return;
+      sender = _resolveSenderContact();
+    }
+    if (sender == null) {
+      await _showBlockingAlert(
+        'Cannot fetch voice',
+        'Sender contact is unknown. Sync contacts first.',
+      );
       return;
     }
+    if (sender.outPathLen < 0) {
+      await _showBlockingAlert(
+        'Cannot fetch voice',
+        'Sender route is unknown. Sync contacts/path first.',
+      );
+      return;
+    }
+    if (sender.outPathLen > _maxFetchHops) {
+      await _showBlockingAlert(
+        'Cannot fetch voice',
+        'Message is too far (${sender.outPathLen} hops, max $_maxFetchHops).',
+      );
+      return;
+    }
+    if (sender.outPathLen >= 2) {
+      _showToast(
+        'Voice fetch over ${sender.outPathLen} hops may take a while.',
+      );
+    }
+
+    if (!mounted) return;
+    setState(() {
+      _errorText = null;
+    });
 
     final connectionProvider = context.read<ConnectionProvider>();
     final deviceKey = connectionProvider.deviceInfo.publicKey;
     if (deviceKey == null || deviceKey.length < 6) {
-      _setUnavailable();
+      await _showBlockingAlert(
+        'Cannot fetch voice',
+        'Device key is unavailable.',
+      );
       return;
     }
 
@@ -213,7 +273,30 @@ class _VoiceMessageBubbleState extends State<VoiceMessageBubble> {
     );
     if (!sent) {
       _setUnavailable();
+      return;
     }
+
+    // Timeout = 2× estimated LoRa airtime (min 30s).
+    final txEstimate = envelope != null
+        ? estimateVoiceTransmitDuration(
+            packetCount: envelope.total,
+            mode: envelope.mode,
+            durationMs: envelope.durationMs,
+            pathLen: pathLen,
+            radioBw: radioBw,
+            radioSf: radioSf,
+            radioCr: radioCr,
+          )
+        : const Duration(seconds: 15);
+    _requestTimeoutTimer?.cancel();
+    _requestTimeoutTimer = TransferTimeout.start(
+      txEstimate: txEstimate,
+      onTimeout: () {
+        if (mounted && _isRequesting) {
+          _setUnavailable();
+        }
+      },
+    );
   }
 
   void _setUnavailable() {
@@ -243,9 +326,42 @@ class _VoiceMessageBubbleState extends State<VoiceMessageBubble> {
       if (contact != null) return contact;
     }
 
+    final senderName = widget.message.senderName?.trim();
+    if (senderName != null && senderName.isNotEmpty) {
+      for (final contact in contactsProvider.contacts) {
+        if (contact.advName.trim().toLowerCase() == senderName.toLowerCase()) {
+          return contact;
+        }
+      }
+    }
+
     return null;
   }
 
+  void _showToast(String message) {
+    if (!mounted) return;
+    ScaffoldMessenger.of(context).showSnackBar(
+      SnackBar(content: Text(message), duration: const Duration(seconds: 3)),
+    );
+  }
+
+  Future<void> _showBlockingAlert(String title, String message) async {
+    if (!mounted) return;
+    await showDialog<void>(
+      context: context,
+      builder: (dialogContext) => AlertDialog(
+        title: Text(title),
+        content: Text(message),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(dialogContext).pop(),
+            child: const Text('OK'),
+          ),
+        ],
+      ),
+    );
+  }
+
   static String _formatDuration(double seconds) {
     final s = seconds.round();
     if (s < 60) return '${s}s';

pubspec.lock

@@ -883,7 +883,7 @@ packages:
     description:
       path: "."
       ref: main
-      resolved-ref: "624e3d3cf6ea32d8245cc85d5b599f30ca910501"
+      resolved-ref: d6f91774f19136ff71b0087feaf95fa5490524d9
       url: "https://github.com/dz0ny/meshcore_client.git"
     source: git
     version: "0.1.0"

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.0302.1+4
+version: 2026.0305.1+7
 
 environment:
   sdk: ^3.9.2