chore: Initial commit

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XPovRHpejR4zRxuhjY4Qs3

lib/models/advert_location.dart

@@ -0,0 +1 @@
+export 'package:meshcore_client/meshcore_client.dart' show AdvertLocation;

lib/models/ble_packet_log.dart

@@ -0,0 +1,2 @@
+export 'package:meshcore_client/meshcore_client.dart'
+    show BlePacketLog, PacketDirection, LogRxDataInfo;

lib/models/channel.dart

@@ -0,0 +1,204 @@
+import 'dart:convert';
+import 'dart:typed_data';
+import 'package:crypto/crypto.dart';
+
+/// Channel model - represents a communication channel
+///
+/// Supports two types of channels:
+/// 1. Hash-based channels: Names starting with '#' (e.g., '#team', '#sar-ops')
+///    - Secrets are auto-generated using SHA256(name)
+///    - Same name produces same secret on all devices
+/// 2. Normal channels: Any name with explicit secret
+///    - User provides explicit 16-byte secret
+///    - Only known to those who share the secret
+class Channel {
+  final int index; // 0-255
+  final String name;
+  final Uint8List secret; // 16 bytes
+  final int? flags;
+
+  Channel({
+    required this.index,
+    required this.name,
+    required this.secret,
+    this.flags,
+  }) {
+    if (secret.length != 16) {
+      throw ArgumentError('Channel secret must be exactly 16 bytes');
+    }
+    if (index < 0 || index > 255) {
+      throw ArgumentError('Channel index must be 0-255');
+    }
+  }
+
+  /// Create a channel with auto-generated secret for #channels
+  ///
+  /// For #channels (name starting with '#'):
+  /// - Secret is auto-generated using SHA256(name)[0:16]
+  /// - Deterministic: same name = same secret across all devices
+  ///
+  /// For normal channels:
+  /// - Must provide explicit 16-byte secret
+  factory Channel.create({
+    required int index,
+    required String name,
+    Uint8List? explicitSecret,
+    int? flags,
+  }) {
+    if (name.startsWith('#')) {
+      // Hash-based channel: auto-generate secret from name
+      if (explicitSecret != null) {
+        throw ArgumentError(
+          'Cannot provide explicit secret for #channel. Secret is auto-generated.',
+        );
+      }
+      final secret = _generateHashChannelSecret(name);
+      return Channel(index: index, name: name, secret: secret, flags: flags);
+    } else {
+      // Normal channel: require explicit secret
+      if (explicitSecret == null || explicitSecret.length != 16) {
+        throw ArgumentError('Normal channels require a 16-byte secret');
+      }
+      return Channel(
+        index: index,
+        name: name,
+        secret: explicitSecret,
+        flags: flags,
+      );
+    }
+  }
+
+  /// Generate secret for #channel using SHA256
+  /// Python equivalent: hashlib.sha256(channel_name.encode()).digest()[0:16]
+  static Uint8List _generateHashChannelSecret(String channelName) {
+    final bytes = utf8.encode(channelName);
+    final digest = sha256.convert(bytes);
+    return Uint8List.fromList(digest.bytes.sublist(0, 16));
+  }
+
+  static bool isHashChannelName(String channelName) {
+    return channelName.trim().startsWith('#');
+  }
+
+  static String pskBase64ForHashChannelName(String channelName) {
+    final normalized = channelName.trim();
+    if (!isHashChannelName(normalized)) {
+      throw ArgumentError('Only #channels can export derived psk_base64');
+    }
+    return base64.encode(_generateHashChannelSecret(normalized));
+  }
+
+  /// Create the default public channel (channel 0)
+  /// Uses the well-known pre-shared key from MeshCore
+  factory Channel.publicChannel() {
+    return Channel(
+      index: 0,
+      name: 'Public Channel',
+      secret: Uint8List.fromList([
+        0x8b,
+        0x33,
+        0x87,
+        0xe9,
+        0xc5,
+        0xcd,
+        0xea,
+        0x6a,
+        0xc9,
+        0xe5,
+        0xed,
+        0xba,
+        0xa1,
+        0x15,
+        0xcd,
+        0x72,
+      ]),
+      flags: null,
+    );
+  }
+
+  /// Check if this is a hash-based channel (name starts with '#')
+  bool get isHashChannel => name.startsWith('#');
+
+  /// Base64-encoded PSK for sharing with firmware CLI and related tooling.
+  String get pskBase64 => base64.encode(secret);
+
+  /// MeshCore group packets carry the first byte of SHA256(channel secret).
+  int get hashByte {
+    final digest = sha256.convert(secret);
+    return digest.bytes.first;
+  }
+
+  String get hashHex =>
+      hashByte.toRadixString(16).padLeft(2, '0').toUpperCase();
+
+  /// Display name for the channel
+  /// Returns "Public" for channel 0, otherwise returns the custom name or "Channel N"
+  String get displayName {
+    if (index == 0) {
+      return name.isEmpty ? 'Public' : name;
+    }
+    return name.isEmpty ? 'Channel $index' : name;
+  }
+
+  /// Check if channel is the public channel (index 0)
+  bool get isPublicChannel => index == 0;
+
+  /// Check if channel has a custom name
+  bool get hasCustomName => name.isNotEmpty;
+
+  /// Create from JSON
+  factory Channel.fromJson(Map<String, dynamic> json) {
+    return Channel(
+      index: json['index'] as int,
+      name: json['name'] as String? ?? '',
+      secret: base64.decode(json['secret'] as String),
+      flags: json['flags'] as int?,
+    );
+  }
+
+  /// Convert to JSON
+  Map<String, dynamic> toJson() {
+    return {
+      'index': index,
+      'name': name,
+      'secret': base64.encode(secret),
+      'flags': flags,
+    };
+  }
+
+  /// Create a copy with modified fields
+  Channel copyWith({int? index, String? name, Uint8List? secret, int? flags}) {
+    return Channel(
+      index: index ?? this.index,
+      name: name ?? this.name,
+      secret: secret ?? this.secret,
+      flags: flags ?? this.flags,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'Channel(index: $index, name: $name, isHashChannel: $isHashChannel, flags: $flags)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    return other is Channel &&
+        other.index == index &&
+        other.name == name &&
+        _secretsEqual(other.secret, secret) &&
+        other.flags == flags;
+  }
+
+  @override
+  int get hashCode => Object.hash(index, name, secret, flags);
+
+  bool _secretsEqual(Uint8List a, Uint8List b) {
+    if (a.length != b.length) return false;
+    for (int i = 0; i < a.length; i++) {
+      if (a[i] != b[i]) return false;
+    }
+    return true;
+  }
+}

lib/models/config_profile.dart

@@ -0,0 +1,518 @@
+import 'package:flutter/foundation.dart';
+import 'channel.dart';
+
+@immutable
+class DeviceConfigProfileSection {
+  final int? frequencyKhz;
+  final int? bandwidth;
+  final int? spreadingFactor;
+  final int? codingRate;
+  final bool? repeatEnabled;
+  final int? txPower;
+  final int? telemetryModes;
+  final int? advertLocationPolicy;
+  final int? multiAcks;
+  final bool? manualAddContacts;
+  final bool? autoAddUsers;
+  final bool? autoAddRepeaters;
+  final bool? autoAddRoomServers;
+  final bool? autoAddSensors;
+  final bool? autoAddOverwriteOldest;
+  final double? publicLatitude;
+  final double? publicLongitude;
+
+  const DeviceConfigProfileSection({
+    this.frequencyKhz,
+    this.bandwidth,
+    this.spreadingFactor,
+    this.codingRate,
+    this.repeatEnabled,
+    this.txPower,
+    this.telemetryModes,
+    this.advertLocationPolicy,
+    this.multiAcks,
+    this.manualAddContacts,
+    this.autoAddUsers,
+    this.autoAddRepeaters,
+    this.autoAddRoomServers,
+    this.autoAddSensors,
+    this.autoAddOverwriteOldest,
+    this.publicLatitude,
+    this.publicLongitude,
+  });
+
+  bool get isEmpty =>
+      frequencyKhz == null &&
+      bandwidth == null &&
+      spreadingFactor == null &&
+      codingRate == null &&
+      repeatEnabled == null &&
+      txPower == null &&
+      telemetryModes == null &&
+      advertLocationPolicy == null &&
+      multiAcks == null &&
+      manualAddContacts == null &&
+      autoAddUsers == null &&
+      autoAddRepeaters == null &&
+      autoAddRoomServers == null &&
+      autoAddSensors == null &&
+      autoAddOverwriteOldest == null &&
+      publicLatitude == null &&
+      publicLongitude == null;
+
+  Map<String, dynamic> toJson() => {
+    'frequencyKhz': frequencyKhz,
+    'bandwidth': bandwidth,
+    'spreadingFactor': spreadingFactor,
+    'codingRate': codingRate,
+    'repeatEnabled': repeatEnabled,
+    'txPower': txPower,
+    'telemetryModes': telemetryModes,
+    'advertLocationPolicy': advertLocationPolicy,
+    'multiAcks': multiAcks,
+    'manualAddContacts': manualAddContacts,
+    'autoAddUsers': autoAddUsers,
+    'autoAddRepeaters': autoAddRepeaters,
+    'autoAddRoomServers': autoAddRoomServers,
+    'autoAddSensors': autoAddSensors,
+    'autoAddOverwriteOldest': autoAddOverwriteOldest,
+    'publicLatitude': publicLatitude,
+    'publicLongitude': publicLongitude,
+  };
+
+  factory DeviceConfigProfileSection.fromJson(Map<String, dynamic> json) {
+    return DeviceConfigProfileSection(
+      frequencyKhz: json['frequencyKhz'] as int?,
+      bandwidth: json['bandwidth'] as int?,
+      spreadingFactor: json['spreadingFactor'] as int?,
+      codingRate: json['codingRate'] as int?,
+      repeatEnabled: json['repeatEnabled'] as bool?,
+      txPower: json['txPower'] as int?,
+      telemetryModes: json['telemetryModes'] as int?,
+      advertLocationPolicy: json['advertLocationPolicy'] as int?,
+      multiAcks: json['multiAcks'] as int?,
+      manualAddContacts: json['manualAddContacts'] as bool?,
+      autoAddUsers: json['autoAddUsers'] as bool?,
+      autoAddRepeaters: json['autoAddRepeaters'] as bool?,
+      autoAddRoomServers: json['autoAddRoomServers'] as bool?,
+      autoAddSensors: json['autoAddSensors'] as bool?,
+      autoAddOverwriteOldest: json['autoAddOverwriteOldest'] as bool?,
+      publicLatitude: (json['publicLatitude'] as num?)?.toDouble(),
+      publicLongitude: (json['publicLongitude'] as num?)?.toDouble(),
+    );
+  }
+}
+
+@immutable
+class AppSettingsProfileSection {
+  final bool? mapEnabled;
+  final bool? contactsEnabled;
+  final bool? sensorsEnabled;
+  final bool? voiceSilenceTrimmingEnabled;
+  final bool? voiceBandPassFilterEnabled;
+  final bool? voiceCompressorEnabled;
+  final bool? voiceLimiterEnabled;
+  final bool? voiceAutoGainEnabled;
+  final bool? voiceEchoCancellationEnabled;
+  final bool? voiceNoiseSuppressionEnabled;
+  final double? messageFontScale;
+  final bool? clearPathOnMaxRetry;
+  final bool? nearestRelayFallbackEnabled;
+  final int? voiceBitrate;
+  final int? routeHashSize;
+  final int? imageMaxSize;
+  final int? imageCompression;
+  final bool? imageGrayscale;
+  final bool? imageUltraMode;
+  final bool? showRxTxIndicators;
+  final bool? fastLocationUpdatesEnabled;
+  final double? fastLocationMovementThresholdMeters;
+  final int? fastLocationActiveCadenceSeconds;
+
+  const AppSettingsProfileSection({
+    this.mapEnabled,
+    this.contactsEnabled,
+    this.sensorsEnabled,
+    this.voiceSilenceTrimmingEnabled,
+    this.voiceBandPassFilterEnabled,
+    this.voiceCompressorEnabled,
+    this.voiceLimiterEnabled,
+    this.voiceAutoGainEnabled,
+    this.voiceEchoCancellationEnabled,
+    this.voiceNoiseSuppressionEnabled,
+    this.messageFontScale,
+    this.clearPathOnMaxRetry,
+    this.nearestRelayFallbackEnabled,
+    this.voiceBitrate,
+    this.routeHashSize,
+    this.imageMaxSize,
+    this.imageCompression,
+    this.imageGrayscale,
+    this.imageUltraMode,
+    this.showRxTxIndicators,
+    this.fastLocationUpdatesEnabled,
+    this.fastLocationMovementThresholdMeters,
+    this.fastLocationActiveCadenceSeconds,
+  });
+
+  bool get isEmpty =>
+      mapEnabled == null &&
+      contactsEnabled == null &&
+      sensorsEnabled == null &&
+      voiceSilenceTrimmingEnabled == null &&
+      voiceBandPassFilterEnabled == null &&
+      voiceCompressorEnabled == null &&
+      voiceLimiterEnabled == null &&
+      voiceAutoGainEnabled == null &&
+      voiceEchoCancellationEnabled == null &&
+      voiceNoiseSuppressionEnabled == null &&
+      messageFontScale == null &&
+      clearPathOnMaxRetry == null &&
+      nearestRelayFallbackEnabled == null &&
+      voiceBitrate == null &&
+      routeHashSize == null &&
+      imageMaxSize == null &&
+      imageCompression == null &&
+      imageGrayscale == null &&
+      imageUltraMode == null &&
+      showRxTxIndicators == null &&
+      fastLocationUpdatesEnabled == null &&
+      fastLocationMovementThresholdMeters == null &&
+      fastLocationActiveCadenceSeconds == null;
+
+  Map<String, dynamic> toJson() => {
+    'mapEnabled': mapEnabled,
+    'contactsEnabled': contactsEnabled,
+    'sensorsEnabled': sensorsEnabled,
+    'voiceSilenceTrimmingEnabled': voiceSilenceTrimmingEnabled,
+    'voiceBandPassFilterEnabled': voiceBandPassFilterEnabled,
+    'voiceCompressorEnabled': voiceCompressorEnabled,
+    'voiceLimiterEnabled': voiceLimiterEnabled,
+    'voiceAutoGainEnabled': voiceAutoGainEnabled,
+    'voiceEchoCancellationEnabled': voiceEchoCancellationEnabled,
+    'voiceNoiseSuppressionEnabled': voiceNoiseSuppressionEnabled,
+    'messageFontScale': messageFontScale,
+    'clearPathOnMaxRetry': clearPathOnMaxRetry,
+    'nearestRelayFallbackEnabled': nearestRelayFallbackEnabled,
+    'voiceBitrate': voiceBitrate,
+    'routeHashSize': routeHashSize,
+    'imageMaxSize': imageMaxSize,
+    'imageCompression': imageCompression,
+    'imageGrayscale': imageGrayscale,
+    'imageUltraMode': imageUltraMode,
+    'showRxTxIndicators': showRxTxIndicators,
+    'fastLocationUpdatesEnabled': fastLocationUpdatesEnabled,
+    'fastLocationMovementThresholdMeters': fastLocationMovementThresholdMeters,
+    'fastLocationActiveCadenceSeconds': fastLocationActiveCadenceSeconds,
+  };
+
+  factory AppSettingsProfileSection.fromJson(Map<String, dynamic> json) {
+    return AppSettingsProfileSection(
+      mapEnabled: json['mapEnabled'] as bool?,
+      contactsEnabled: json['contactsEnabled'] as bool?,
+      sensorsEnabled: json['sensorsEnabled'] as bool?,
+      voiceSilenceTrimmingEnabled: json['voiceSilenceTrimmingEnabled'] as bool?,
+      voiceBandPassFilterEnabled: json['voiceBandPassFilterEnabled'] as bool?,
+      voiceCompressorEnabled: json['voiceCompressorEnabled'] as bool?,
+      voiceLimiterEnabled: json['voiceLimiterEnabled'] as bool?,
+      voiceAutoGainEnabled: json['voiceAutoGainEnabled'] as bool?,
+      voiceEchoCancellationEnabled:
+          json['voiceEchoCancellationEnabled'] as bool?,
+      voiceNoiseSuppressionEnabled:
+          json['voiceNoiseSuppressionEnabled'] as bool?,
+      messageFontScale: (json['messageFontScale'] as num?)?.toDouble(),
+      clearPathOnMaxRetry: json['clearPathOnMaxRetry'] as bool?,
+      nearestRelayFallbackEnabled: json['nearestRelayFallbackEnabled'] as bool?,
+      voiceBitrate: json['voiceBitrate'] as int?,
+      routeHashSize: json['routeHashSize'] as int?,
+      imageMaxSize: json['imageMaxSize'] as int?,
+      imageCompression: json['imageCompression'] as int?,
+      imageGrayscale: json['imageGrayscale'] as bool?,
+      imageUltraMode: json['imageUltraMode'] as bool?,
+      showRxTxIndicators: json['showRxTxIndicators'] as bool?,
+      fastLocationUpdatesEnabled: json['fastLocationUpdatesEnabled'] as bool?,
+      fastLocationMovementThresholdMeters:
+          (json['fastLocationMovementThresholdMeters'] as num?)?.toDouble(),
+      fastLocationActiveCadenceSeconds:
+          json['fastLocationActiveCadenceSeconds'] as int?,
+    );
+  }
+}
+
+@immutable
+class MapWorkspaceProfileSection {
+  final Map<String, dynamic>? mapPrefs;
+  final List<Map<String, dynamic>> drawings;
+  final Map<String, dynamic>? currentTrail;
+  final List<Map<String, dynamic>> trailHistory;
+  final Map<String, dynamic>? importedTrail;
+  final bool? isTrailVisible;
+  final bool? showCadastralOverlay;
+  final bool? showForestRoadsOverlay;
+  final bool? showHikingTrailsOverlay;
+  final bool? showMainRoadsOverlay;
+  final bool? showHouseNumbersOverlay;
+  final bool? showFireHazardZonesOverlay;
+  final bool? showHistoricalFiresOverlay;
+  final bool? showFirebreaksOverlay;
+  final bool? showKrasFireZonesOverlay;
+  final bool? showPlaceNamesOverlay;
+  final bool? showMunicipalityBordersOverlay;
+  final bool? hideRepeatersOnMap;
+
+  const MapWorkspaceProfileSection({
+    this.mapPrefs,
+    this.drawings = const [],
+    this.currentTrail,
+    this.trailHistory = const [],
+    this.importedTrail,
+    this.isTrailVisible,
+    this.showCadastralOverlay,
+    this.showForestRoadsOverlay,
+    this.showHikingTrailsOverlay,
+    this.showMainRoadsOverlay,
+    this.showHouseNumbersOverlay,
+    this.showFireHazardZonesOverlay,
+    this.showHistoricalFiresOverlay,
+    this.showFirebreaksOverlay,
+    this.showKrasFireZonesOverlay,
+    this.showPlaceNamesOverlay,
+    this.showMunicipalityBordersOverlay,
+    this.hideRepeatersOnMap,
+  });
+
+  bool get isEmpty =>
+      mapPrefs == null &&
+      drawings.isEmpty &&
+      currentTrail == null &&
+      trailHistory.isEmpty &&
+      importedTrail == null &&
+      isTrailVisible == null &&
+      showCadastralOverlay == null &&
+      showForestRoadsOverlay == null &&
+      showHikingTrailsOverlay == null &&
+      showMainRoadsOverlay == null &&
+      showHouseNumbersOverlay == null &&
+      showFireHazardZonesOverlay == null &&
+      showHistoricalFiresOverlay == null &&
+      showFirebreaksOverlay == null &&
+      showKrasFireZonesOverlay == null &&
+      showPlaceNamesOverlay == null &&
+      showMunicipalityBordersOverlay == null &&
+      hideRepeatersOnMap == null;
+
+  Map<String, dynamic> toJson() => {
+    'mapPrefs': mapPrefs,
+    'drawings': drawings,
+    'currentTrail': currentTrail,
+    'trailHistory': trailHistory,
+    'importedTrail': importedTrail,
+    'isTrailVisible': isTrailVisible,
+    'showCadastralOverlay': showCadastralOverlay,
+    'showForestRoadsOverlay': showForestRoadsOverlay,
+    'showHikingTrailsOverlay': showHikingTrailsOverlay,
+    'showMainRoadsOverlay': showMainRoadsOverlay,
+    'showHouseNumbersOverlay': showHouseNumbersOverlay,
+    'showFireHazardZonesOverlay': showFireHazardZonesOverlay,
+    'showHistoricalFiresOverlay': showHistoricalFiresOverlay,
+    'showFirebreaksOverlay': showFirebreaksOverlay,
+    'showKrasFireZonesOverlay': showKrasFireZonesOverlay,
+    'showPlaceNamesOverlay': showPlaceNamesOverlay,
+    'showMunicipalityBordersOverlay': showMunicipalityBordersOverlay,
+    'hideRepeatersOnMap': hideRepeatersOnMap,
+  };
+
+  factory MapWorkspaceProfileSection.fromJson(Map<String, dynamic> json) {
+    List<Map<String, dynamic>> decodeList(String key) {
+      final raw = json[key] as List<dynamic>? ?? const [];
+      return raw.whereType<Map<String, dynamic>>().toList();
+    }
+
+    return MapWorkspaceProfileSection(
+      mapPrefs: json['mapPrefs'] as Map<String, dynamic>?,
+      drawings: decodeList('drawings'),
+      currentTrail: json['currentTrail'] as Map<String, dynamic>?,
+      trailHistory: decodeList('trailHistory'),
+      importedTrail: json['importedTrail'] as Map<String, dynamic>?,
+      isTrailVisible: json['isTrailVisible'] as bool?,
+      showCadastralOverlay: json['showCadastralOverlay'] as bool?,
+      showForestRoadsOverlay: json['showForestRoadsOverlay'] as bool?,
+      showHikingTrailsOverlay: json['showHikingTrailsOverlay'] as bool?,
+      showMainRoadsOverlay: json['showMainRoadsOverlay'] as bool?,
+      showHouseNumbersOverlay: json['showHouseNumbersOverlay'] as bool?,
+      showFireHazardZonesOverlay: json['showFireHazardZonesOverlay'] as bool?,
+      showHistoricalFiresOverlay: json['showHistoricalFiresOverlay'] as bool?,
+      showFirebreaksOverlay: json['showFirebreaksOverlay'] as bool?,
+      showKrasFireZonesOverlay: json['showKrasFireZonesOverlay'] as bool?,
+      showPlaceNamesOverlay: json['showPlaceNamesOverlay'] as bool?,
+      showMunicipalityBordersOverlay:
+          json['showMunicipalityBordersOverlay'] as bool?,
+      hideRepeatersOnMap: json['hideRepeatersOnMap'] as bool?,
+    );
+  }
+}
+
+@immutable
+class ConfigProfileSections {
+  final DeviceConfigProfileSection? deviceConfig;
+  final AppSettingsProfileSection? appSettings;
+  final MapWorkspaceProfileSection? mapWorkspace;
+  final List<Channel> channels;
+
+  const ConfigProfileSections({
+    this.deviceConfig,
+    this.appSettings,
+    this.mapWorkspace,
+    this.channels = const [],
+  });
+
+  bool get isEmpty =>
+      (deviceConfig == null || deviceConfig!.isEmpty) &&
+      (appSettings == null || appSettings!.isEmpty) &&
+      (mapWorkspace == null || mapWorkspace!.isEmpty) &&
+      channels.isEmpty;
+
+  Map<String, dynamic> toJson() => {
+    'deviceConfig': deviceConfig?.toJson(),
+    'appSettings': appSettings?.toJson(),
+    'mapWorkspace': mapWorkspace?.toJson(),
+    'channels': channels.map((channel) => channel.toJson()).toList(),
+  };
+
+  factory ConfigProfileSections.fromJson(Map<String, dynamic> json) {
+    final rawChannels = json['channels'] as List<dynamic>? ?? const [];
+    return ConfigProfileSections(
+      deviceConfig: json['deviceConfig'] is Map<String, dynamic>
+          ? DeviceConfigProfileSection.fromJson(
+              json['deviceConfig'] as Map<String, dynamic>,
+            )
+          : null,
+      appSettings: json['appSettings'] is Map<String, dynamic>
+          ? AppSettingsProfileSection.fromJson(
+              json['appSettings'] as Map<String, dynamic>,
+            )
+          : null,
+      mapWorkspace: json['mapWorkspace'] is Map<String, dynamic>
+          ? MapWorkspaceProfileSection.fromJson(
+              json['mapWorkspace'] as Map<String, dynamic>,
+            )
+          : null,
+      channels: rawChannels
+          .whereType<Map<String, dynamic>>()
+          .map(Channel.fromJson)
+          .toList(),
+    );
+  }
+}
+
+@immutable
+class ConfigProfile {
+  static const String defaultProfileId = 'default';
+
+  final String id;
+  final String name;
+  final DateTime createdAt;
+  final DateTime updatedAt;
+  final String? notes;
+  final ConfigProfileSections sections;
+
+  const ConfigProfile({
+    required this.id,
+    required this.name,
+    required this.createdAt,
+    required this.updatedAt,
+    required this.sections,
+    this.notes,
+  });
+
+  bool get isDefault => id == defaultProfileId;
+
+  factory ConfigProfile.defaultProfile() {
+    final now = DateTime.now();
+    return ConfigProfile(
+      id: defaultProfileId,
+      name: 'Default',
+      createdAt: now,
+      updatedAt: now,
+      sections: const ConfigProfileSections(),
+    );
+  }
+
+  ConfigProfile copyWith({
+    String? id,
+    String? name,
+    DateTime? createdAt,
+    DateTime? updatedAt,
+    String? notes,
+    ConfigProfileSections? sections,
+  }) {
+    return ConfigProfile(
+      id: id ?? this.id,
+      name: name ?? this.name,
+      createdAt: createdAt ?? this.createdAt,
+      updatedAt: updatedAt ?? this.updatedAt,
+      notes: notes ?? this.notes,
+      sections: sections ?? this.sections,
+    );
+  }
+
+  Map<String, dynamic> toJson() => {
+    'id': id,
+    'name': name,
+    'createdAt': createdAt.toIso8601String(),
+    'updatedAt': updatedAt.toIso8601String(),
+    'notes': notes,
+    'sections': sections.toJson(),
+  };
+
+  factory ConfigProfile.fromJson(Map<String, dynamic> json) {
+    return ConfigProfile(
+      id: json['id'] as String,
+      name: json['name'] as String,
+      createdAt: DateTime.parse(json['createdAt'] as String),
+      updatedAt: DateTime.parse(json['updatedAt'] as String),
+      notes: json['notes'] as String?,
+      sections: ConfigProfileSections.fromJson(
+        json['sections'] as Map<String, dynamic>? ?? const {},
+      ),
+    );
+  }
+}
+
+@immutable
+class ProfileDiff {
+  final List<String> changedSections;
+
+  const ProfileDiff({required this.changedSections});
+}
+
+@immutable
+class ProfileTransferRecord {
+  final String profileId;
+  final String direction;
+  final DateTime timestamp;
+  final String detail;
+
+  const ProfileTransferRecord({
+    required this.profileId,
+    required this.direction,
+    required this.timestamp,
+    required this.detail,
+  });
+
+  Map<String, dynamic> toJson() => {
+    'profileId': profileId,
+    'direction': direction,
+    'timestamp': timestamp.toIso8601String(),
+    'detail': detail,
+  };
+
+  factory ProfileTransferRecord.fromJson(Map<String, dynamic> json) {
+    return ProfileTransferRecord(
+      profileId: json['profileId'] as String,
+      direction: json['direction'] as String,
+      timestamp: DateTime.parse(json['timestamp'] as String),
+      detail: json['detail'] as String,
+    );
+  }
+}

lib/models/contact.dart

@@ -0,0 +1,309 @@
+export 'package:meshcore_client/meshcore_client.dart'
+    show Contact, ContactType, ContactTelemetry, AdvertLocation;
+
+import 'dart:math' as math;
+import 'dart:typed_data';
+import 'package:flutter/material.dart';
+import '../l10n/app_localizations.dart';
+import 'package:meshcore_client/meshcore_client.dart';
+
+class ParsedContactRoute {
+  final String canonicalText;
+  final int hashSize;
+  final int hopCount;
+  final int encodedPathLen;
+  final int signedEncodedPathLen;
+  final Uint8List pathBytes;
+  final Uint8List paddedPathBytes;
+
+  const ParsedContactRoute({
+    required this.canonicalText,
+    required this.hashSize,
+    required this.hopCount,
+    required this.encodedPathLen,
+    required this.signedEncodedPathLen,
+    required this.pathBytes,
+    required this.paddedPathBytes,
+  });
+
+  int get byteLength => pathBytes.length;
+  String get summary => hopCount == 0
+      ? 'Direct'
+      : '$hopCount hop${hopCount == 1 ? '' : 's'} via $hashSize-byte hashes';
+}
+
+class ContactRouteFormatException implements Exception {
+  final String message;
+
+  const ContactRouteFormatException(this.message);
+
+  @override
+  String toString() => message;
+}
+
+class ContactRouteCodec {
+  static const int maxHashSize = 3;
+  static const int maxPathBytes = 64;
+  static const int _unknownDescriptor = 0xFF;
+
+  static ParsedContactRoute parse(String input, {int? expectedHashSize}) {
+    final normalized = input.trim().toUpperCase();
+    if (normalized.isEmpty) {
+      throw const ContactRouteFormatException('Route cannot be empty.');
+    }
+
+    if (expectedHashSize != null &&
+        (expectedHashSize < 1 || expectedHashSize > maxHashSize)) {
+      throw const ContactRouteFormatException(
+        'Hash size must be 1, 2, or 3 bytes.',
+      );
+    }
+
+    final hopTokens = normalized
+        .split(',')
+        .map((token) => token.trim())
+        .toList();
+    if (hopTokens.any((token) => token.isEmpty)) {
+      throw const ContactRouteFormatException('Route contains an empty hop.');
+    }
+
+    final hopBytes = <List<int>>[];
+    int? hashSize;
+    for (final token in hopTokens) {
+      final compact = token.replaceAll(':', '');
+      if (compact.isEmpty || !RegExp(r'^[0-9A-F]+$').hasMatch(compact)) {
+        throw ContactRouteFormatException('Invalid hop "$token".');
+      }
+      if (compact.length.isOdd) {
+        throw ContactRouteFormatException(
+          'Hop "$token" must contain full bytes.',
+        );
+      }
+
+      final currentHashSize = compact.length ~/ 2;
+      if (currentHashSize < 1 || currentHashSize > maxHashSize) {
+        throw ContactRouteFormatException(
+          'Hop "$token" must be 1, 2, or 3 bytes.',
+        );
+      }
+
+      if (expectedHashSize != null && currentHashSize != expectedHashSize) {
+        throw ContactRouteFormatException(
+          'Hop "$token" must be $expectedHashSize '
+          'byte${expectedHashSize == 1 ? '' : 's'}.',
+        );
+      }
+
+      hashSize ??= currentHashSize;
+      if (hashSize != currentHashSize) {
+        throw const ContactRouteFormatException(
+          'All hops in a route must use the same hash size.',
+        );
+      }
+
+      final bytes = <int>[];
+      for (var i = 0; i < compact.length; i += 2) {
+        bytes.add(int.parse(compact.substring(i, i + 2), radix: 16));
+      }
+      hopBytes.add(bytes);
+    }
+
+    final resolvedHashSize = hashSize ?? 1;
+    final flatBytes = Uint8List.fromList(
+      hopBytes.expand((hop) => hop).toList(),
+    );
+    if (flatBytes.length > maxPathBytes) {
+      throw const ContactRouteFormatException(
+        'Route exceeds the 64-byte firmware limit.',
+      );
+    }
+
+    final encodedPathLen =
+        ((resolvedHashSize - 1) << 6) | (hopBytes.length & 0x3F);
+    final padded = Uint8List(maxPathBytes);
+    padded.setRange(0, flatBytes.length, flatBytes);
+
+    return ParsedContactRoute(
+      canonicalText: hopBytes
+          .map(
+            (hop) => hop
+                .map((byte) => byte.toRadixString(16).padLeft(2, '0'))
+                .join()
+                .toUpperCase(),
+          )
+          .join(','),
+      hashSize: resolvedHashSize,
+      hopCount: hopBytes.length,
+      encodedPathLen: encodedPathLen,
+      signedEncodedPathLen: toSignedDescriptor(encodedPathLen),
+      pathBytes: flatBytes,
+      paddedPathBytes: padded,
+    );
+  }
+
+  static ParsedContactRoute direct({int hashSize = 1}) {
+    if (hashSize < 1 || hashSize > maxHashSize) {
+      throw ArgumentError.value(hashSize, 'hashSize', 'Must be 1, 2, or 3.');
+    }
+
+    final encodedPathLen = (hashSize - 1) << 6;
+    return ParsedContactRoute(
+      canonicalText: '',
+      hashSize: hashSize,
+      hopCount: 0,
+      encodedPathLen: encodedPathLen,
+      signedEncodedPathLen: toSignedDescriptor(encodedPathLen),
+      pathBytes: Uint8List(0),
+      paddedPathBytes: Uint8List(maxPathBytes),
+    );
+  }
+
+  static ParsedContactRoute? fromContact(Contact contact) {
+    if (!contact.routeHasPath || contact.routeHopCount == 0) {
+      return null;
+    }
+
+    return ParsedContactRoute(
+      canonicalText: contact.routeCanonicalText,
+      hashSize: contact.routeHashSize,
+      hopCount: contact.routeHopCount,
+      encodedPathLen: contact.routeEncodedPathLen,
+      signedEncodedPathLen: contact.routeSignedPathLen,
+      pathBytes: contact.routePathBytes,
+      paddedPathBytes: _padPath(contact.routePathBytes),
+    );
+  }
+
+  static Uint8List _padPath(Uint8List bytes) {
+    final padded = Uint8List(maxPathBytes);
+    padded.setRange(0, math.min(bytes.length, maxPathBytes), bytes);
+    return padded;
+  }
+
+  static int toSignedDescriptor(int encodedPathLen) =>
+      encodedPathLen > 127 ? encodedPathLen - 256 : encodedPathLen;
+
+  static int toUnsignedDescriptor(int signedPathLen) => signedPathLen & 0xFF;
+
+  static bool isUnknownDescriptor(int signedPathLen) =>
+      toUnsignedDescriptor(signedPathLen) == _unknownDescriptor;
+
+  static bool isValidDescriptor(int signedPathLen) {
+    final raw = toUnsignedDescriptor(signedPathLen);
+    if (raw == _unknownDescriptor) return false;
+    final hashSize = ((raw >> 6) + 1);
+    if (hashSize > maxHashSize) return false;
+    final hopCount = raw & 0x3F;
+    return hopCount * hashSize <= maxPathBytes;
+  }
+
+  /// Converts an encoded MeshCore route descriptor + path into the legacy raw
+  /// path format expected by the `CMD_SEND_RAW_DATA` (0x19) handler in
+  /// companion firmware v1.15.
+  ///
+  /// The raw-data handler treats the path-length byte as a *literal* hop count
+  /// (one byte per hop) rather than as an encoded descriptor, so a 1-hop route
+  /// using 2-byte hashes (descriptor `0x41`) would otherwise be misread as
+  /// "65 path bytes" and rejected with `ERROR: Unsupported command`. We
+  /// down-sample every hop to its first hash byte and emit a plain hop count.
+  ///
+  /// Routes that are already legacy (hash size 1, descriptor `< 0x40`) pass
+  /// through unchanged. Unknown/flood descriptors collapse to a zero-hop
+  /// direct path (raw transport does not support flood routing).
+  static LegacyRawPath toLegacyRawPath(int descriptor, Uint8List path) {
+    final raw = toUnsignedDescriptor(descriptor);
+    if (raw == _unknownDescriptor) {
+      return const LegacyRawPath(length: 0, path: <int>[]);
+    }
+    if (raw < 0x40) {
+      // Hash size 1: the encoded path is already one byte per hop.
+      final hopCount = raw;
+      final available = math.min(hopCount, path.length);
+      return LegacyRawPath(
+        length: hopCount,
+        path: Uint8List.fromList(path.sublist(0, available)),
+      );
+    }
+    final hopCount = raw & 0x3F;
+    final hashSize = ((raw >> 6) & 0x03) + 1;
+    final legacy = Uint8List(hopCount);
+    for (var hop = 0; hop < hopCount; hop++) {
+      final srcIndex = hop * hashSize;
+      if (srcIndex < path.length) {
+        legacy[hop] = path[srcIndex];
+      }
+    }
+    return LegacyRawPath(length: hopCount, path: legacy);
+  }
+}
+
+/// Legacy raw-transport path: a literal hop count plus one byte per hop, as
+/// expected by the firmware `CMD_SEND_RAW_DATA` handler.
+class LegacyRawPath {
+  const LegacyRawPath({required this.length, required this.path});
+
+  final int length;
+  final List<int> path;
+}
+
+extension ContactLocalization on Contact {
+  /// Returns the localized display name for special contacts (e.g. Public Channel).
+  /// For all other contacts, returns [displayName].
+  String getLocalizedDisplayName(BuildContext context) {
+    if (isPublicChannel) {
+      return AppLocalizations.of(context)!.publicChannel;
+    }
+    return displayName;
+  }
+
+  int get routeEncodedPathLen =>
+      ContactRouteCodec.toUnsignedDescriptor(outPathLen);
+
+  int get routeSignedPathLen =>
+      ContactRouteCodec.toSignedDescriptor(routeEncodedPathLen);
+
+  bool get routeIsUnknown => ContactRouteCodec.isUnknownDescriptor(outPathLen);
+
+  bool get routeHasPath =>
+      !routeIsUnknown && ContactRouteCodec.isValidDescriptor(outPathLen);
+
+  int get routeHashSize => routeHasPath ? ((routeEncodedPathLen >> 6) + 1) : 1;
+
+  int get routeHopCount => routeHasPath ? (routeEncodedPathLen & 0x3F) : -1;
+
+  int get routeByteLength => routeHasPath
+      ? math.min(routeHopCount * routeHashSize, outPath.length)
+      : 0;
+
+  Uint8List get routePathBytes => routeByteLength <= 0
+      ? Uint8List(0)
+      : Uint8List.fromList(outPath.sublist(0, routeByteLength));
+
+  String get routeCanonicalText {
+    if (!routeHasPath || routeHopCount <= 0) return '';
+    final bytes = routePathBytes;
+    final hops = <String>[];
+    for (var i = 0; i < bytes.length; i += routeHashSize) {
+      hops.add(
+        bytes
+            .sublist(i, i + routeHashSize)
+            .map((byte) => byte.toRadixString(16).padLeft(2, '0'))
+            .join()
+            .toUpperCase(),
+      );
+    }
+    return hops.join(',');
+  }
+
+  String get routeSummary {
+    if (routeIsUnknown) {
+      return 'Flood/Unknown';
+    }
+    if (!routeHasPath || routeHopCount == 0) {
+      return 'Direct';
+    }
+    return '$routeHopCount hop${routeHopCount == 1 ? '' : 's'} via $routeHashSize-byte hashes';
+  }
+
+  bool get routeSupportsLegacyRawTransport => routeHasPath;
+}

lib/models/contact_group.dart

@@ -0,0 +1,39 @@
+class SavedContactGroup {
+  final String id;
+  final String sectionKey;
+  final String label;
+  final String query;
+  final DateTime createdAt;
+  final List<String>? matchPrefixes;
+  final bool isAutoGroup;
+
+  const SavedContactGroup({
+    required this.id,
+    required this.sectionKey,
+    required this.label,
+    required this.query,
+    required this.createdAt,
+    this.matchPrefixes,
+    this.isAutoGroup = false,
+  });
+
+  SavedContactGroup copyWith({
+    String? id,
+    String? sectionKey,
+    String? label,
+    String? query,
+    DateTime? createdAt,
+    List<String>? matchPrefixes,
+    bool? isAutoGroup,
+  }) {
+    return SavedContactGroup(
+      id: id ?? this.id,
+      sectionKey: sectionKey ?? this.sectionKey,
+      label: label ?? this.label,
+      query: query ?? this.query,
+      createdAt: createdAt ?? this.createdAt,
+      matchPrefixes: matchPrefixes ?? this.matchPrefixes,
+      isAutoGroup: isAutoGroup ?? this.isAutoGroup,
+    );
+  }
+}

lib/models/contact_telemetry.dart

@@ -0,0 +1 @@
+export 'package:meshcore_client/meshcore_client.dart' show ContactTelemetry;

lib/models/custom_map_config.dart

@@ -0,0 +1,151 @@
+import 'dart:math' as math;
+
+import 'package:flutter_map/flutter_map.dart';
+import 'package:latlong2/latlong.dart';
+
+import '../utils/custom_map_id.dart';
+
+class CustomMapConfig {
+  final String filePath;
+  final String displayName;
+  final String mapId;
+  final int imageWidth;
+  final int imageHeight;
+  final double? metersPerPixel;
+  final LatLng? calibrationPointA;
+  final LatLng? calibrationPointB;
+
+  const CustomMapConfig({
+    required this.filePath,
+    required this.displayName,
+    required this.mapId,
+    required this.imageWidth,
+    required this.imageHeight,
+    this.metersPerPixel,
+    this.calibrationPointA,
+    this.calibrationPointB,
+  });
+
+  bool get isCalibrated => metersPerPixel != null && metersPerPixel! > 0;
+
+  double get _displayScale {
+    final heightScale = imageHeight / 90.0;
+    final widthScale = imageWidth / 180.0;
+    return math.max(1.0, math.max(heightScale, widthScale));
+  }
+
+  double get _displayHeight => imageHeight / _displayScale;
+
+  double get _displayWidth => imageWidth / _displayScale;
+
+  LatLngBounds get bounds =>
+      LatLngBounds(const LatLng(0, 0), LatLng(_displayHeight, _displayWidth));
+
+  LatLngBounds get displayBounds =>
+      LatLngBounds(LatLng(_displayHeight, 0), LatLng(0, _displayWidth));
+
+  LatLng toDisplayPoint(LatLng point) {
+    return LatLng(
+      _displayHeight - (point.latitude / _displayScale),
+      point.longitude / _displayScale,
+    );
+  }
+
+  LatLng fromDisplayPoint(LatLng point) {
+    return LatLng(
+      (_displayHeight - point.latitude) * _displayScale,
+      point.longitude * _displayScale,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'filePath': filePath,
+      'displayName': displayName,
+      'mapId': mapId,
+      'imageWidth': imageWidth,
+      'imageHeight': imageHeight,
+      'metersPerPixel': metersPerPixel,
+      'calibrationPointA': calibrationPointA != null
+          ? {
+              'lat': calibrationPointA!.latitude,
+              'lon': calibrationPointA!.longitude,
+            }
+          : null,
+      'calibrationPointB': calibrationPointB != null
+          ? {
+              'lat': calibrationPointB!.latitude,
+              'lon': calibrationPointB!.longitude,
+            }
+          : null,
+    };
+  }
+
+  CustomMapConfig copyWith({
+    String? filePath,
+    String? displayName,
+    String? mapId,
+    int? imageWidth,
+    int? imageHeight,
+    double? metersPerPixel,
+    bool clearMetersPerPixel = false,
+    LatLng? calibrationPointA,
+    bool clearCalibrationPointA = false,
+    LatLng? calibrationPointB,
+    bool clearCalibrationPointB = false,
+  }) {
+    return CustomMapConfig(
+      filePath: filePath ?? this.filePath,
+      displayName: displayName ?? this.displayName,
+      mapId: normalizeCustomMapId(mapId) ?? this.mapId,
+      imageWidth: imageWidth ?? this.imageWidth,
+      imageHeight: imageHeight ?? this.imageHeight,
+      metersPerPixel: clearMetersPerPixel
+          ? null
+          : (metersPerPixel ?? this.metersPerPixel),
+      calibrationPointA: clearCalibrationPointA
+          ? null
+          : (calibrationPointA ?? this.calibrationPointA),
+      calibrationPointB: clearCalibrationPointB
+          ? null
+          : (calibrationPointB ?? this.calibrationPointB),
+    );
+  }
+
+  static CustomMapConfig? fromJson(Map<String, dynamic>? json) {
+    if (json == null) return null;
+
+    final filePath = json['filePath'];
+    final displayName = json['displayName'];
+    final mapId = json['mapId'];
+    final imageWidth = json['imageWidth'];
+    final imageHeight = json['imageHeight'];
+    if (filePath is! String ||
+        displayName is! String ||
+        mapId is! String ||
+        imageWidth is! int ||
+        imageHeight is! int) {
+      return null;
+    }
+
+    LatLng? parsePoint(dynamic raw) {
+      if (raw is! Map<String, dynamic>) return null;
+      final lat = raw['lat'];
+      final lon = raw['lon'];
+      if (lat is! num || lon is! num) return null;
+      return LatLng(lat.toDouble(), lon.toDouble());
+    }
+
+    final metersPerPixel = json['metersPerPixel'];
+    return CustomMapConfig(
+      filePath: filePath,
+      displayName: displayName,
+      mapId: normalizeCustomMapId(mapId) ?? mapId,
+      imageWidth: imageWidth,
+      imageHeight: imageHeight,
+      metersPerPixel: metersPerPixel is num ? metersPerPixel.toDouble() : null,
+      calibrationPointA: parsePoint(json['calibrationPointA']),
+      calibrationPointB: parsePoint(json['calibrationPointB']),
+    );
+  }
+}

lib/models/device_info.dart

@@ -0,0 +1,338 @@
+import 'dart:typed_data';
+
+/// BLE connection state
+enum ConnectionState {
+  disconnected,
+  connecting,
+  connected,
+  disconnecting,
+  error,
+}
+
+/// Connection mode for app operation
+enum ConnectionMode {
+  /// Direct BLE connection to MeshCore device (default)
+  ble,
+
+  /// Direct TCP/WiFi connection to MeshCore device (port 5000)
+  tcp,
+
+  /// USB serial connection (Android OTG or Web Serial API)
+  usb,
+}
+
+extension ConnectionModeExtension on ConnectionMode {
+  String get displayName {
+    switch (this) {
+      case ConnectionMode.ble:
+        return 'Direct (BLE)';
+      case ConnectionMode.tcp:
+        return 'Direct (WiFi)';
+      case ConnectionMode.usb:
+        return 'Direct (Serial)';
+    }
+  }
+
+  String get description {
+    switch (this) {
+      case ConnectionMode.ble:
+        return 'Direct BLE connection to MeshCore device';
+      case ConnectionMode.tcp:
+        return 'Direct WiFi/TCP connection to MeshCore device';
+      case ConnectionMode.usb:
+        return 'Direct serial connection to MeshCore device';
+    }
+  }
+}
+
+/// MeshCore device information
+class DeviceInfo {
+  final String? deviceId;
+  final String? deviceName;
+  final ConnectionState connectionState;
+  final int? batteryMilliVolts;
+  final double? batteryPercentage;
+  final int? storageUsedKb;
+  final int? storageTotalKb;
+  final int? signalRssi;
+  final double? signalSnr;
+  final DateTime? lastUpdate;
+
+  // Self info from MeshCore device
+  final int? deviceType;
+  final int? txPower;
+  final int? maxTxPower;
+  final Uint8List? publicKey;
+  final int? advLat;
+  final int? advLon;
+  final bool? manualAddContacts;
+  final bool? autoAddUsers;
+  final bool? autoAddRepeaters;
+  final bool? autoAddRoomServers;
+  final bool? autoAddSensors;
+  final bool? autoAddOverwriteOldest;
+  final int? autoAddMaxHops;
+  final int? radioFreq;
+  final int? radioBw;
+  final int? radioSf;
+  final int? radioCr;
+  final String? selfName;
+
+  // Additional device capabilities (from RESP_CODE_DEVICE_INFO)
+  final int? maxContacts; // Max contacts device supports
+  final int? maxChannels; // Max channels device supports
+  final int?
+  telemetryModes; // Telemetry permission modes (bits 0-1: Base, bits 2-3: Location)
+  final int? blePin; // BLE PIN code
+  final int? multiAcks; // Extra ACK mode (0=no, 1=yes)
+  final int?
+  advertLocPolicy; // Location sharing policy (0=don't share, 1=share)
+
+  // Firmware info
+  final int? firmwareVersion;
+  final String? firmwareBuildDate;
+  final String? manufacturerModel;
+  final String? semanticVersion;
+
+  // Repeat mode (firmware v9+)
+  final bool? clientRepeat;
+  final int? pathHashMode;
+  final bool? supportsSpectrumScan;
+  final int? spectrumScanMinKhz;
+  final int? spectrumScanMaxKhz;
+  final List<({int lower, int upper})>? allowedRepeatFreqRanges;
+
+  DeviceInfo({
+    this.deviceId,
+    this.deviceName,
+    this.connectionState = ConnectionState.disconnected,
+    this.batteryMilliVolts,
+    this.batteryPercentage,
+    this.storageUsedKb,
+    this.storageTotalKb,
+    this.signalRssi,
+    this.signalSnr,
+    this.lastUpdate,
+    this.deviceType,
+    this.txPower,
+    this.maxTxPower,
+    this.publicKey,
+    this.advLat,
+    this.advLon,
+    this.manualAddContacts,
+    this.autoAddUsers,
+    this.autoAddRepeaters,
+    this.autoAddRoomServers,
+    this.autoAddSensors,
+    this.autoAddOverwriteOldest,
+    this.autoAddMaxHops,
+    this.radioFreq,
+    this.radioBw,
+    this.radioSf,
+    this.radioCr,
+    this.selfName,
+    this.maxContacts,
+    this.maxChannels,
+    this.telemetryModes,
+    this.blePin,
+    this.multiAcks,
+    this.advertLocPolicy,
+    this.firmwareVersion,
+    this.firmwareBuildDate,
+    this.manufacturerModel,
+    this.semanticVersion,
+    this.clientRepeat,
+    this.pathHashMode,
+    this.supportsSpectrumScan,
+    this.spectrumScanMinKhz,
+    this.spectrumScanMaxKhz,
+    this.allowedRepeatFreqRanges,
+  });
+
+  /// Check if device is connected
+  bool get isConnected => connectionState == ConnectionState.connected;
+
+  /// Check if device is connecting
+  bool get isConnecting => connectionState == ConnectionState.connecting;
+
+  /// Check if device has error
+  bool get hasError => connectionState == ConnectionState.error;
+
+  /// Get battery percentage (calculated or provided)
+  double? get batteryPercent {
+    if (batteryPercentage != null) return batteryPercentage!;
+    if (batteryMilliVolts == null) return null;
+
+    // Rough conversion from mV to percentage (3.0V = 0%, 4.2V = 100%)
+    final voltage = batteryMilliVolts! / 1000.0;
+    if (voltage <= 3.0) return 0.0;
+    if (voltage >= 4.2) return 100.0;
+    return ((voltage - 3.0) / 1.2) * 100.0;
+  }
+
+  /// Get battery status
+  String get batteryStatus {
+    final percent = batteryPercent;
+    if (percent == null) return 'Unknown';
+    if (percent > 80) return 'Excellent';
+    if (percent > 50) return 'Good';
+    if (percent > 20) return 'Low';
+    return 'Critical';
+  }
+
+  /// Get storage usage percentage (0-100)
+  double? get storageUsedPercent {
+    if (storageUsedKb == null ||
+        storageTotalKb == null ||
+        storageTotalKb == 0) {
+      return null;
+    }
+    return (storageUsedKb! / storageTotalKb!) * 100.0;
+  }
+
+  /// Get storage available in KB
+  int? get storageAvailableKb {
+    if (storageUsedKb == null || storageTotalKb == null) {
+      return null;
+    }
+    return storageTotalKb! - storageUsedKb!;
+  }
+
+  /// Get human-readable storage status
+  String get storageStatus {
+    final percent = storageUsedPercent;
+    if (percent == null) return 'Unknown';
+    if (percent < 50) return 'Plenty Available';
+    if (percent < 80) return 'Moderate Usage';
+    if (percent < 95) return 'Low Space';
+    return 'Critical - Nearly Full';
+  }
+
+  /// Get signal strength category
+  String get signalStrength {
+    if (signalRssi == null) return 'Unknown';
+    if (signalRssi! > -60) return 'Excellent';
+    if (signalRssi! > -70) return 'Good';
+    if (signalRssi! > -80) return 'Fair';
+    return 'Poor';
+  }
+
+  /// Get public key as hex string (short)
+  String? get publicKeyShort {
+    if (publicKey == null || publicKey!.length < 8) return null;
+    return publicKey!
+        .sublist(0, 8)
+        .map((b) => b.toRadixString(16).padLeft(2, '0'))
+        .join('');
+  }
+
+  /// Get display name with "MeshCore-" prefix removed
+  String? get displayName {
+    if (deviceName == null) return null;
+    if (deviceName!.startsWith('MeshCore-')) {
+      return deviceName!.substring(9); // Remove "MeshCore-" (9 characters)
+    }
+    return deviceName;
+  }
+
+  DeviceInfo copyWith({
+    String? deviceId,
+    String? deviceName,
+    ConnectionState? connectionState,
+    int? batteryMilliVolts,
+    double? batteryPercentage,
+    int? storageUsedKb,
+    int? storageTotalKb,
+    int? signalRssi,
+    double? signalSnr,
+    DateTime? lastUpdate,
+    int? deviceType,
+    int? txPower,
+    int? maxTxPower,
+    Uint8List? publicKey,
+    int? advLat,
+    int? advLon,
+    bool? manualAddContacts,
+    bool? autoAddUsers,
+    bool? autoAddRepeaters,
+    bool? autoAddRoomServers,
+    bool? autoAddSensors,
+    bool? autoAddOverwriteOldest,
+    int? autoAddMaxHops,
+    int? radioFreq,
+    int? radioBw,
+    int? radioSf,
+    int? radioCr,
+    String? selfName,
+    int? maxContacts,
+    int? maxChannels,
+    int? telemetryModes,
+    int? blePin,
+    int? multiAcks,
+    int? advertLocPolicy,
+    int? firmwareVersion,
+    String? firmwareBuildDate,
+    String? manufacturerModel,
+    String? semanticVersion,
+    bool? clientRepeat,
+    int? pathHashMode,
+    bool? supportsSpectrumScan,
+    int? spectrumScanMinKhz,
+    int? spectrumScanMaxKhz,
+    List<({int lower, int upper})>? allowedRepeatFreqRanges,
+  }) {
+    return DeviceInfo(
+      deviceId: deviceId ?? this.deviceId,
+      deviceName: deviceName ?? this.deviceName,
+      connectionState: connectionState ?? this.connectionState,
+      batteryMilliVolts: batteryMilliVolts ?? this.batteryMilliVolts,
+      batteryPercentage: batteryPercentage ?? this.batteryPercentage,
+      storageUsedKb: storageUsedKb ?? this.storageUsedKb,
+      storageTotalKb: storageTotalKb ?? this.storageTotalKb,
+      signalRssi: signalRssi ?? this.signalRssi,
+      signalSnr: signalSnr ?? this.signalSnr,
+      lastUpdate: lastUpdate ?? this.lastUpdate,
+      deviceType: deviceType ?? this.deviceType,
+      txPower: txPower ?? this.txPower,
+      maxTxPower: maxTxPower ?? this.maxTxPower,
+      publicKey: publicKey ?? this.publicKey,
+      advLat: advLat ?? this.advLat,
+      advLon: advLon ?? this.advLon,
+      manualAddContacts: manualAddContacts ?? this.manualAddContacts,
+      autoAddUsers: autoAddUsers ?? this.autoAddUsers,
+      autoAddRepeaters: autoAddRepeaters ?? this.autoAddRepeaters,
+      autoAddRoomServers: autoAddRoomServers ?? this.autoAddRoomServers,
+      autoAddSensors: autoAddSensors ?? this.autoAddSensors,
+      autoAddOverwriteOldest:
+          autoAddOverwriteOldest ?? this.autoAddOverwriteOldest,
+      autoAddMaxHops: autoAddMaxHops ?? this.autoAddMaxHops,
+      radioFreq: radioFreq ?? this.radioFreq,
+      radioBw: radioBw ?? this.radioBw,
+      radioSf: radioSf ?? this.radioSf,
+      radioCr: radioCr ?? this.radioCr,
+      selfName: selfName ?? this.selfName,
+      maxContacts: maxContacts ?? this.maxContacts,
+      maxChannels: maxChannels ?? this.maxChannels,
+      telemetryModes: telemetryModes ?? this.telemetryModes,
+      blePin: blePin ?? this.blePin,
+      multiAcks: multiAcks ?? this.multiAcks,
+      advertLocPolicy: advertLocPolicy ?? this.advertLocPolicy,
+      firmwareVersion: firmwareVersion ?? this.firmwareVersion,
+      firmwareBuildDate: firmwareBuildDate ?? this.firmwareBuildDate,
+      manufacturerModel: manufacturerModel ?? this.manufacturerModel,
+      semanticVersion: semanticVersion ?? this.semanticVersion,
+      clientRepeat: clientRepeat ?? this.clientRepeat,
+      pathHashMode: pathHashMode ?? this.pathHashMode,
+      supportsSpectrumScan: supportsSpectrumScan ?? this.supportsSpectrumScan,
+      spectrumScanMinKhz: spectrumScanMinKhz ?? this.spectrumScanMinKhz,
+      spectrumScanMaxKhz: spectrumScanMaxKhz ?? this.spectrumScanMaxKhz,
+      allowedRepeatFreqRanges:
+          allowedRepeatFreqRanges ?? this.allowedRepeatFreqRanges,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'DeviceInfo(name: $deviceName, state: $connectionState, battery: ${batteryPercent?.toStringAsFixed(0)}%, signal: $signalRssi dBm)';
+  }
+}

lib/models/location_trail.dart

@@ -0,0 +1,106 @@
+import 'package:latlong2/latlong.dart';
+
+/// Represents a single point in a location trail
+class TrailPoint {
+  final LatLng position;
+  final DateTime timestamp;
+  final double? accuracy;
+  final double? speed;
+
+  TrailPoint({
+    required this.position,
+    required this.timestamp,
+    this.accuracy,
+    this.speed,
+  });
+
+  Map<String, dynamic> toJson() => {
+        'lat': position.latitude,
+        'lon': position.longitude,
+        'timestamp': timestamp.toIso8601String(),
+        'accuracy': accuracy,
+        'speed': speed,
+      };
+
+  factory TrailPoint.fromJson(Map<String, dynamic> json) {
+    return TrailPoint(
+      position: LatLng(json['lat'] as double, json['lon'] as double),
+      timestamp: DateTime.parse(json['timestamp'] as String),
+      accuracy: json['accuracy'] as double?,
+      speed: json['speed'] as double?,
+    );
+  }
+}
+
+/// Represents a location trail (breadcrumb trail) on the map
+class LocationTrail {
+  final String id;
+  final List<TrailPoint> points;
+  final DateTime startTime;
+  DateTime? endTime;
+  bool isActive;
+
+  LocationTrail({
+    required this.id,
+    List<TrailPoint>? points,
+    DateTime? startTime,
+    this.endTime,
+    this.isActive = true,
+  })  : points = points ?? [],
+        startTime = startTime ?? DateTime.now();
+
+  /// Add a new point to the trail
+  void addPoint(TrailPoint point) {
+    points.add(point);
+  }
+
+  /// Get total distance traveled in meters
+  double get totalDistance {
+    if (points.length < 2) return 0;
+
+    final distance = Distance();
+    double total = 0;
+
+    for (int i = 0; i < points.length - 1; i++) {
+      total += distance.as(
+        LengthUnit.Meter,
+        points[i].position,
+        points[i + 1].position,
+      );
+    }
+
+    return total;
+  }
+
+  /// Get duration of the trail
+  Duration get duration {
+    if (points.isEmpty) return Duration.zero;
+    final end = endTime ?? DateTime.now();
+    return end.difference(startTime);
+  }
+
+  /// Get list of LatLng points for rendering
+  List<LatLng> get latLngPoints => points.map((p) => p.position).toList();
+
+  Map<String, dynamic> toJson() => {
+        'id': id,
+        'points': points.map((p) => p.toJson()).toList(),
+        'startTime': startTime.toIso8601String(),
+        'endTime': endTime?.toIso8601String(),
+        'isActive': isActive,
+      };
+
+  factory LocationTrail.fromJson(Map<String, dynamic> json) {
+    return LocationTrail(
+      id: json['id'] as String,
+      points: (json['points'] as List)
+          .map((p) => TrailPoint.fromJson(p as Map<String, dynamic>))
+          .toList(),
+      startTime: DateTime.parse(json['startTime'] as String),
+      endTime: json['endTime'] != null
+          ? DateTime.parse(json['endTime'] as String)
+          : null,
+      isActive: json['isActive'] as bool? ?? true,
+    );
+  }
+}

lib/models/map_coordinate_space.dart

@@ -0,0 +1,11 @@
+enum MapCoordinateSpace {
+  geo,
+  customMap;
+
+  static MapCoordinateSpace fromName(String? value) {
+    return MapCoordinateSpace.values.firstWhere(
+      (space) => space.name == value,
+      orElse: () => MapCoordinateSpace.geo,
+    );
+  }
+}

lib/models/map_drawing.dart

@@ -0,0 +1,495 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart';
+import 'package:latlong2/latlong.dart';
+
+import 'map_coordinate_space.dart';
+import '../utils/custom_map_id.dart';
+
+/// Drawing shape type
+enum DrawingShapeType { line, rectangle }
+
+/// Drawing color enum for compact network transmission
+enum DrawingColor { red, blue, green, yellow, orange, purple, pink, cyan }
+
+/// Drawing colors available for user selection
+class DrawingColors {
+  static const List<Color> palette = [
+    Colors.red,
+    Colors.blue,
+    Colors.green,
+    Colors.yellow,
+    Colors.orange,
+    Colors.purple,
+    Colors.pink,
+    Colors.cyan,
+  ];
+
+  static String colorToName(Color color) {
+    if (color == Colors.red) return 'Red';
+    if (color == Colors.blue) return 'Blue';
+    if (color == Colors.green) return 'Green';
+    if (color == Colors.yellow) return 'Yellow';
+    if (color == Colors.orange) return 'Orange';
+    if (color == Colors.purple) return 'Purple';
+    if (color == Colors.pink) return 'Pink';
+    if (color == Colors.cyan) return 'Cyan';
+    return 'Unknown';
+  }
+
+  static int colorToIndex(Color color) {
+    for (int i = 0; i < palette.length; i++) {
+      if (palette[i].toARGB32() == color.toARGB32()) {
+        return i;
+      }
+    }
+    return 0;
+  }
+
+  static Color indexToColor(int index) {
+    if (index >= 0 && index < palette.length) {
+      return palette[index];
+    }
+    return palette[0];
+  }
+}
+
+abstract class MapDrawing {
+  final String id;
+  final DrawingShapeType type;
+  final Color color;
+  final DateTime createdAt;
+  final String? senderName;
+  final bool isReceived;
+  final String? messageId;
+  final bool isShared;
+  final bool isSent;
+  final bool isHidden;
+  final MapCoordinateSpace coordinateSpace;
+  final String? mapId;
+
+  MapDrawing({
+    required this.id,
+    required this.type,
+    required this.color,
+    required this.createdAt,
+    this.senderName,
+    this.isReceived = false,
+    this.messageId,
+    this.isShared = false,
+    this.isSent = false,
+    this.isHidden = false,
+    this.coordinateSpace = MapCoordinateSpace.geo,
+    this.mapId,
+  });
+
+  bool get isCustomMap => coordinateSpace == MapCoordinateSpace.customMap;
+
+  Map<String, dynamic> toJson();
+
+  Map<String, dynamic> toNetworkJson();
+
+  static MapDrawing? fromNetworkJson(
+    Map<String, dynamic> json, {
+    String? senderName,
+    String? messageId,
+    MapCoordinateSpace coordinateSpace = MapCoordinateSpace.geo,
+    String? mapId,
+  }) {
+    final typeNum = json['t'] as int?;
+    if (typeNum == null ||
+        typeNum < 0 ||
+        typeNum >= DrawingShapeType.values.length) {
+      return null;
+    }
+
+    try {
+      final type = DrawingShapeType.values[typeNum];
+      switch (type) {
+        case DrawingShapeType.line:
+          return LineDrawing.fromNetworkJson(
+            json,
+            senderName: senderName,
+            messageId: messageId,
+            coordinateSpace: coordinateSpace,
+            mapId: mapId,
+          );
+        case DrawingShapeType.rectangle:
+          return RectangleDrawing.fromNetworkJson(
+            json,
+            senderName: senderName,
+            messageId: messageId,
+            coordinateSpace: coordinateSpace,
+            mapId: mapId,
+          );
+      }
+    } catch (_) {
+      return null;
+    }
+  }
+
+  static MapDrawing? fromJson(Map<String, dynamic> json) {
+    final typeStr = json['type'] as String?;
+    if (typeStr == null) return null;
+
+    try {
+      final type = DrawingShapeType.values.firstWhere(
+        (value) => value.name == typeStr,
+      );
+      switch (type) {
+        case DrawingShapeType.line:
+          return LineDrawing.fromJson(json);
+        case DrawingShapeType.rectangle:
+          return RectangleDrawing.fromJson(json);
+      }
+    } catch (_) {
+      return null;
+    }
+  }
+
+  LatLng getCenter();
+
+  LatLngBounds getBounds();
+}
+
+class LineDrawing extends MapDrawing {
+  final List<LatLng> points;
+
+  LineDrawing({
+    required super.id,
+    required super.color,
+    required super.createdAt,
+    required this.points,
+    super.senderName,
+    super.isReceived,
+    super.messageId,
+    super.isShared,
+    super.isSent,
+    super.isHidden,
+    super.coordinateSpace,
+    super.mapId,
+  }) : super(type: DrawingShapeType.line);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'type': type.name,
+      'color': color.toARGB32(),
+      'createdAt': createdAt.toIso8601String(),
+      'points': points
+          .map((point) => {'lat': point.latitude, 'lon': point.longitude})
+          .toList(),
+      'isShared': isShared,
+      'coordinateSpace': coordinateSpace.name,
+      'mapId': normalizeCustomMapId(mapId),
+    };
+  }
+
+  @override
+  Map<String, dynamic> toNetworkJson() {
+    final payload = <String, dynamic>{
+      't': type.index,
+      'c': DrawingColors.colorToIndex(color),
+    };
+
+    if (coordinateSpace == MapCoordinateSpace.customMap) {
+      payload['m'] = normalizeCustomMapId(mapId);
+      payload['p'] = points
+          .expand((point) => [point.latitude.round(), point.longitude.round()])
+          .toList();
+      return payload;
+    }
+
+    payload['p'] = points
+        .expand(
+          (point) => [
+            double.parse(point.latitude.toStringAsFixed(5)),
+            double.parse(point.longitude.toStringAsFixed(5)),
+          ],
+        )
+        .toList();
+    return payload;
+  }
+
+  static LineDrawing fromJson(Map<String, dynamic> json) {
+    final pointsJson = json['points'] as List<dynamic>;
+    final points = pointsJson
+        .map(
+          (point) => LatLng(
+            (point['lat'] as num).toDouble(),
+            (point['lon'] as num).toDouble(),
+          ),
+        )
+        .toList();
+    final senderName = json['sender'] as String?;
+
+    return LineDrawing(
+      id: json['id'] as String,
+      color: Color(json['color'] as int),
+      createdAt: DateTime.parse(json['createdAt'] as String),
+      points: points,
+      senderName: senderName,
+      isReceived: senderName != null,
+      isShared: json['isShared'] as bool? ?? false,
+      coordinateSpace: MapCoordinateSpace.fromName(
+        json['coordinateSpace'] as String?,
+      ),
+      mapId: normalizeCustomMapId(json['mapId'] as String?),
+    );
+  }
+
+  static LineDrawing fromNetworkJson(
+    Map<String, dynamic> json, {
+    String? senderName,
+    String? messageId,
+    MapCoordinateSpace coordinateSpace = MapCoordinateSpace.geo,
+    String? mapId,
+  }) {
+    final flatPoints = (json['p'] as List<dynamic>).cast<num>();
+    final points = <LatLng>[];
+    for (int i = 0; i < flatPoints.length; i += 2) {
+      points.add(
+        LatLng(flatPoints[i].toDouble(), flatPoints[i + 1].toDouble()),
+      );
+    }
+
+    return LineDrawing(
+      id: DateTime.now().millisecondsSinceEpoch.toString(),
+      color: DrawingColors.indexToColor(json['c'] as int),
+      createdAt: DateTime.now(),
+      points: points,
+      senderName: senderName,
+      isReceived: true,
+      messageId: messageId,
+      coordinateSpace: coordinateSpace,
+      mapId: normalizeCustomMapId(mapId),
+    );
+  }
+
+  LineDrawing copyWith({
+    List<LatLng>? points,
+    bool? isHidden,
+    bool? isShared,
+    bool? isReceived,
+    String? messageId,
+    String? senderName,
+    MapCoordinateSpace? coordinateSpace,
+    String? mapId,
+  }) {
+    return LineDrawing(
+      id: id,
+      color: color,
+      createdAt: createdAt,
+      points: points ?? this.points,
+      isHidden: isHidden ?? this.isHidden,
+      isShared: isShared ?? this.isShared,
+      isReceived: isReceived ?? this.isReceived,
+      messageId: messageId ?? this.messageId,
+      senderName: senderName ?? this.senderName,
+      coordinateSpace: coordinateSpace ?? this.coordinateSpace,
+      mapId: mapId ?? this.mapId,
+    );
+  }
+
+  @override
+  LatLng getCenter() {
+    if (points.isEmpty) return const LatLng(0, 0);
+    if (points.length == 1) return points[0];
+
+    double sumLat = 0;
+    double sumLon = 0;
+    for (final point in points) {
+      sumLat += point.latitude;
+      sumLon += point.longitude;
+    }
+    return LatLng(sumLat / points.length, sumLon / points.length);
+  }
+
+  @override
+  LatLngBounds getBounds() {
+    if (points.isEmpty) {
+      return LatLngBounds(const LatLng(0, 0), const LatLng(0, 0));
+    }
+    if (points.length == 1) {
+      return LatLngBounds(points[0], points[0]);
+    }
+
+    double minLat = points[0].latitude;
+    double maxLat = points[0].latitude;
+    double minLon = points[0].longitude;
+    double maxLon = points[0].longitude;
+
+    for (final point in points) {
+      if (point.latitude < minLat) minLat = point.latitude;
+      if (point.latitude > maxLat) maxLat = point.latitude;
+      if (point.longitude < minLon) minLon = point.longitude;
+      if (point.longitude > maxLon) maxLon = point.longitude;
+    }
+
+    return LatLngBounds(LatLng(minLat, minLon), LatLng(maxLat, maxLon));
+  }
+}
+
+class RectangleDrawing extends MapDrawing {
+  final LatLng topLeft;
+  final LatLng bottomRight;
+
+  RectangleDrawing({
+    required super.id,
+    required super.color,
+    required super.createdAt,
+    required this.topLeft,
+    required this.bottomRight,
+    super.senderName,
+    super.isReceived,
+    super.messageId,
+    super.isShared,
+    super.isSent,
+    super.isHidden,
+    super.coordinateSpace,
+    super.mapId,
+  }) : super(type: DrawingShapeType.rectangle);
+
+  List<LatLng> get corners => [
+    topLeft,
+    LatLng(topLeft.latitude, bottomRight.longitude),
+    bottomRight,
+    LatLng(bottomRight.latitude, topLeft.longitude),
+    topLeft,
+  ];
+
+  @override
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'type': type.name,
+      'color': color.toARGB32(),
+      'createdAt': createdAt.toIso8601String(),
+      'topLeft': {'lat': topLeft.latitude, 'lon': topLeft.longitude},
+      'bottomRight': {
+        'lat': bottomRight.latitude,
+        'lon': bottomRight.longitude,
+      },
+      'isShared': isShared,
+      'coordinateSpace': coordinateSpace.name,
+      'mapId': normalizeCustomMapId(mapId),
+    };
+  }
+
+  @override
+  Map<String, dynamic> toNetworkJson() {
+    final payload = <String, dynamic>{
+      't': type.index,
+      'c': DrawingColors.colorToIndex(color),
+    };
+
+    if (coordinateSpace == MapCoordinateSpace.customMap) {
+      payload['m'] = normalizeCustomMapId(mapId);
+      payload['b'] = [
+        topLeft.latitude.round(),
+        topLeft.longitude.round(),
+        bottomRight.latitude.round(),
+        bottomRight.longitude.round(),
+      ];
+      return payload;
+    }
+
+    payload['b'] = [
+      double.parse(topLeft.latitude.toStringAsFixed(5)),
+      double.parse(topLeft.longitude.toStringAsFixed(5)),
+      double.parse(bottomRight.latitude.toStringAsFixed(5)),
+      double.parse(bottomRight.longitude.toStringAsFixed(5)),
+    ];
+    return payload;
+  }
+
+  static RectangleDrawing fromJson(Map<String, dynamic> json) {
+    final topLeftJson = json['topLeft'] as Map<String, dynamic>;
+    final bottomRightJson = json['bottomRight'] as Map<String, dynamic>;
+    final senderName = json['sender'] as String?;
+
+    return RectangleDrawing(
+      id: json['id'] as String,
+      color: Color(json['color'] as int),
+      createdAt: DateTime.parse(json['createdAt'] as String),
+      topLeft: LatLng(
+        (topLeftJson['lat'] as num).toDouble(),
+        (topLeftJson['lon'] as num).toDouble(),
+      ),
+      bottomRight: LatLng(
+        (bottomRightJson['lat'] as num).toDouble(),
+        (bottomRightJson['lon'] as num).toDouble(),
+      ),
+      senderName: senderName,
+      isReceived: senderName != null,
+      isShared: json['isShared'] as bool? ?? false,
+      coordinateSpace: MapCoordinateSpace.fromName(
+        json['coordinateSpace'] as String?,
+      ),
+      mapId: normalizeCustomMapId(json['mapId'] as String?),
+    );
+  }
+
+  static RectangleDrawing fromNetworkJson(
+    Map<String, dynamic> json, {
+    String? senderName,
+    String? messageId,
+    MapCoordinateSpace coordinateSpace = MapCoordinateSpace.geo,
+    String? mapId,
+  }) {
+    final bounds = (json['b'] as List<dynamic>).cast<num>();
+
+    return RectangleDrawing(
+      id: DateTime.now().millisecondsSinceEpoch.toString(),
+      color: DrawingColors.indexToColor(json['c'] as int),
+      createdAt: DateTime.now(),
+      topLeft: LatLng(bounds[0].toDouble(), bounds[1].toDouble()),
+      bottomRight: LatLng(bounds[2].toDouble(), bounds[3].toDouble()),
+      senderName: senderName,
+      isReceived: true,
+      messageId: messageId,
+      coordinateSpace: coordinateSpace,
+      mapId: normalizeCustomMapId(mapId),
+    );
+  }
+
+  RectangleDrawing copyWith({
+    LatLng? topLeft,
+    LatLng? bottomRight,
+    bool? isHidden,
+    bool? isShared,
+    bool? isReceived,
+    String? messageId,
+    String? senderName,
+    MapCoordinateSpace? coordinateSpace,
+    String? mapId,
+  }) {
+    return RectangleDrawing(
+      id: id,
+      color: color,
+      createdAt: createdAt,
+      topLeft: topLeft ?? this.topLeft,
+      bottomRight: bottomRight ?? this.bottomRight,
+      isHidden: isHidden ?? this.isHidden,
+      isShared: isShared ?? this.isShared,
+      isReceived: isReceived ?? this.isReceived,
+      messageId: messageId ?? this.messageId,
+      senderName: senderName ?? this.senderName,
+      coordinateSpace: coordinateSpace ?? this.coordinateSpace,
+      mapId: mapId ?? this.mapId,
+    );
+  }
+
+  @override
+  LatLng getCenter() {
+    return LatLng(
+      (topLeft.latitude + bottomRight.latitude) / 2,
+      (topLeft.longitude + bottomRight.longitude) / 2,
+    );
+  }
+
+  @override
+  LatLngBounds getBounds() {
+    return LatLngBounds(topLeft, bottomRight);
+  }
+}

lib/models/map_layer.dart

@@ -0,0 +1,194 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_map/flutter_map.dart';
+import '../l10n/app_localizations.dart';
+
+enum MapLayerType {
+  openStreetMap,
+  openTopoMap,
+  esriWorldImagery,
+  googleHybrid,
+  googleRoadmap,
+  googleTerrain,
+  // Kept for stored preference compatibility after MBTiles removal.
+  vectorMbtiles,
+  wmsBase,
+  // Appended last: stored layer preference is the enum index.
+  mapyOutdoor,
+}
+
+class MapLayer {
+  final MapLayerType type;
+  final String name;
+  final String urlTemplate;
+  final String attribution;
+  final double maxZoom;
+
+  /// Extra HTTP headers required by the tile server (e.g. Referer).
+  final Map<String, String>? headers;
+
+  // WMS specific properties
+  final bool isWms;
+  final String? wmsBaseUrl;
+  final List<String>? wmsLayers;
+  final String? wmsFormat;
+  final bool? wmsTransparent;
+  final List<String>? wmsStyles;
+  final Crs? crs;
+
+  const MapLayer({
+    required this.type,
+    required this.name,
+    required this.urlTemplate,
+    required this.attribution,
+    required this.maxZoom,
+    this.headers,
+    this.isWms = false,
+    this.wmsBaseUrl,
+    this.wmsLayers,
+    this.wmsFormat,
+    this.wmsTransparent,
+    this.wmsStyles,
+    this.crs,
+  });
+
+  /// Get localized name for the layer
+  String getLocalizedName(BuildContext context) {
+    final localizations = AppLocalizations.of(context)!;
+    switch (type) {
+      case MapLayerType.openStreetMap:
+        return localizations.openStreetMap;
+      case MapLayerType.openTopoMap:
+        return localizations.openTopoMap;
+      case MapLayerType.esriWorldImagery:
+        return localizations.esriSatellite;
+      case MapLayerType.googleHybrid:
+        return localizations.googleHybrid;
+      case MapLayerType.googleRoadmap:
+        return localizations.googleRoadmap;
+      case MapLayerType.googleTerrain:
+        return localizations.googleTerrain;
+      case MapLayerType.vectorMbtiles:
+        // Legacy value kept only for preference migration compatibility.
+        return name;
+      case MapLayerType.mapyOutdoor:
+        // Brand name, not translated.
+        return name;
+      case MapLayerType.wmsBase:
+        // For WMS layers, use the name (will be localized separately)
+        return name;
+    }
+  }
+
+  static const openStreetMap = MapLayer(
+    type: MapLayerType.openStreetMap,
+    name: 'OpenStreetMap',
+    urlTemplate: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png',
+    attribution: '© OpenStreetMap contributors',
+    maxZoom: 19, // OSM standard maximum
+  );
+
+  static const openTopoMap = MapLayer(
+    type: MapLayerType.openTopoMap,
+    name: 'OpenTopoMap',
+    urlTemplate: 'https://a.tile.opentopomap.org/{z}/{x}/{y}.png',
+    attribution: '© OpenTopoMap (CC-BY-SA)',
+    maxZoom: 17.49, // OpenTopoMap maximum (just below level 18)
+  );
+
+  /// Mapy.cz outdoor map: OSM data with LIDAR-based shaded relief.
+  /// The tile server rejects requests without a mapy.com Referer.
+  static const mapyOutdoor = MapLayer(
+    type: MapLayerType.mapyOutdoor,
+    name: 'Mapy.cz Outdoor (OSM + LIDAR)',
+    urlTemplate: 'https://mapserver.mapy.cz/turist-en/retina/{z}-{x}-{y}',
+    attribution: '© Seznam.cz, a.s., © OpenStreetMap contributors',
+    maxZoom: 19,
+    headers: {'Referer': 'https://mapy.com/'},
+  );
+
+  static const esriWorldImagery = MapLayer(
+    type: MapLayerType.esriWorldImagery,
+    name: 'ESRI Satellite',
+    urlTemplate:
+        'https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}',
+    attribution: '© Esri',
+    maxZoom: 19, // ESRI World Imagery maximum
+  );
+
+  static const googleHybrid = MapLayer(
+    type: MapLayerType.googleHybrid,
+    name: 'Google Hybrid',
+    urlTemplate: 'http://mt0.google.com/vt/lyrs=y&hl=en&x={x}&y={y}&z={z}',
+    attribution: '© Google',
+    maxZoom: 20, // Google Maps maximum
+  );
+
+  static const googleRoadmap = MapLayer(
+    type: MapLayerType.googleRoadmap,
+    name: 'Google Roadmap',
+    urlTemplate: 'http://mt0.google.com/vt/lyrs=m&hl=en&x={x}&y={y}&z={z}',
+    attribution: '© Google',
+    maxZoom: 20, // Google Maps maximum
+  );
+
+  static const googleTerrain = MapLayer(
+    type: MapLayerType.googleTerrain,
+    name: 'Google Terrain',
+    urlTemplate: 'http://mt0.google.com/vt/lyrs=p&hl=en&x={x}&y={y}&z={z}',
+    attribution: '© Google',
+    maxZoom: 20, // Google Maps maximum
+  );
+
+  /// Slovenian Aerial Imagery 2024 (Ortofoto) - WMS Base Layer
+  /// Uses EPSG:3794 coordinate system (GeoWebCache tile matrix zoom 0-15)
+  /// Note: CRS is initialized at runtime in getSlovenianAerial2024()
+  static MapLayer getSlovenianAerial2024(Crs slovenianCrs) {
+    return MapLayer(
+      type: MapLayerType.wmsBase,
+      name: 'Ortofoto 2024 (Slovenija)',
+      urlTemplate: '', // Not used for WMS
+      attribution: '© GURS (Geodetska uprava Republike Slovenije)',
+      maxZoom: 15, // GeoWebCache tile matrix maximum
+      isWms: true,
+      wmsBaseUrl: 'https://prostor.zgs.gov.si/geowebcache/service/wms?',
+      wmsLayers: const ['pregledovalnik:DOF_2024'],
+      wmsFormat: 'image/jpeg',
+      wmsTransparent: false,
+      crs: slovenianCrs,
+    );
+  }
+
+  /// Slovenian Topographic Map 1:25000 (DTK25) - WMS Base Layer
+  /// Uses EPSG:3794 coordinate system (GeoWebCache tile matrix zoom 0-15)
+  /// Note: CRS is initialized at runtime in getDTK25()
+  static MapLayer getDTK25(Crs slovenianCrs) {
+    return MapLayer(
+      type: MapLayerType.wmsBase,
+      name: 'DTK25 (Slovenija)',
+      urlTemplate: '', // Not used for WMS
+      attribution: '© GURS (Geodetska uprava Republike Slovenije)',
+      maxZoom: 15, // GeoWebCache tile matrix maximum
+      isWms: true,
+      wmsBaseUrl: 'https://prostor.zgs.gov.si/geowebcache/service/wms?',
+      wmsLayers: const ['pregledovalnik:DTK25'],
+      wmsFormat: 'image/jpeg',
+      wmsTransparent: false,
+      crs: slovenianCrs,
+    );
+  }
+
+  static const List<MapLayer> allLayers = [
+    openStreetMap,
+    openTopoMap,
+    mapyOutdoor,
+    esriWorldImagery,
+    googleHybrid,
+    googleRoadmap,
+    googleTerrain,
+    // Note: Slovenian aerial layer is added dynamically via getSlovenianAerial2024()
+  ];
+
+  static MapLayer fromType(MapLayerType type) {
+    return allLayers.firstWhere((layer) => layer.type == type);
+  }
+}

lib/models/message.dart

@@ -0,0 +1,83 @@
+export 'package:meshcore_client/meshcore_client.dart'
+    show
+        Message,
+        MessageType,
+        MessageTextType,
+        MessageDeliveryStatus,
+        MessageRecipient;
+
+import 'package:flutter/foundation.dart';
+import 'package:meshcore_client/meshcore_client.dart';
+import 'sar_marker.dart';
+import 'map_coordinate_space.dart';
+import '../utils/voice_message_parser.dart';
+
+extension MessageVoiceExtension on Message {
+  /// True when this message is a voice recording (`V:` text or binary voice).
+  bool get isVoiceMessage => isVoice;
+
+  /// Parses the voice packet mode from the stored [voiceId] session info.
+  /// Returns null for non-voice messages.
+  VoicePacketMode? get voicePacketMode {
+    if (!isVoice || text.isEmpty) return null;
+    final envelope = VoiceEnvelope.tryParseText(text);
+    if (envelope != null) return envelope.mode;
+    final pkt = VoicePacket.tryParseText(text);
+    return pkt?.mode;
+  }
+}
+
+extension MessageSarExtension on Message {
+  /// Infer the [SarMarkerType] from stored SAR fields.
+  /// Returns null if this is not a SAR marker message.
+  SarMarkerType? get sarMarkerType {
+    if (!isSarMarker) return null;
+
+    if (sarCustomEmoji != null && sarCustomEmoji!.isNotEmpty) {
+      return SarMarkerType.fromEmoji(sarCustomEmoji!);
+    }
+
+    final trimmed = text.trim();
+    if (!trimmed.startsWith('S:')) return null;
+
+    final parts = trimmed.split(':');
+    if (parts.length < 3) return null;
+
+    return SarMarkerType.fromEmoji(parts[1]);
+  }
+
+  /// Convert to a [SarMarker] if this message contains SAR data.
+  SarMarker? toSarMarker() {
+    if (!isSarMarker || sarMarkerType == null) {
+      return null;
+    }
+
+    debugPrint('📍 [Message.toSarMarker] Converting to marker:');
+    debugPrint('   message.text: "$text"');
+    debugPrint('   message.sarNotes: "$sarNotes"');
+    debugPrint('   message.sarMarkerType: $sarMarkerType');
+    debugPrint('   message.sarCustomEmoji: "$sarCustomEmoji"');
+
+    final coordinateSpace = sarCustomMapPoint != null && sarCustomMapId != null
+        ? MapCoordinateSpace.customMap
+        : MapCoordinateSpace.geo;
+    final location = sarCustomMapPoint ?? sarGpsCoordinates;
+    if (location == null) {
+      return null;
+    }
+
+    return SarMarker(
+      id: id,
+      type: sarMarkerType!,
+      location: location,
+      timestamp: sentAt,
+      senderPublicKey: senderPublicKeyPrefix,
+      senderName: senderName,
+      notes: sarNotes,
+      customEmoji: sarCustomEmoji,
+      colorIndex: sarColorIndex,
+      coordinateSpace: coordinateSpace,
+      mapId: sarCustomMapId,
+    );
+  }
+}

lib/models/message_contact_location.dart

@@ -0,0 +1,67 @@
+import 'package:latlong2/latlong.dart';
+
+class MessageContactLocation {
+  final LatLng location;
+  final String source;
+  final DateTime capturedAt;
+  final DateTime? sourceTimestamp;
+
+  const MessageContactLocation({
+    required this.location,
+    required this.source,
+    required this.capturedAt,
+    this.sourceTimestamp,
+  });
+
+  String get technicalSourceLabel {
+    switch (source) {
+      case 'shared':
+        return 'shared location';
+      case 'gps':
+        return 'shared location';
+      case 'telemetry':
+        return 'live telemetry';
+      case 'advert':
+        return 'shared advert';
+      default:
+        return source;
+    }
+  }
+
+  String get formattedCoordinates =>
+      '${location.latitude.toStringAsFixed(6)}, ${location.longitude.toStringAsFixed(6)}';
+
+  Map<String, dynamic> toJson() {
+    return {
+      'latitude': location.latitude,
+      'longitude': location.longitude,
+      'source': source,
+      'capturedAtMillis': capturedAt.millisecondsSinceEpoch,
+      'sourceTimestampMillis': sourceTimestamp?.millisecondsSinceEpoch,
+    };
+  }
+
+  static MessageContactLocation? fromJson(Map<String, dynamic> json) {
+    final latitude = json['latitude'];
+    final longitude = json['longitude'];
+    final source = json['source'];
+    final capturedAtMillis = json['capturedAtMillis'];
+    if (latitude is! num ||
+        longitude is! num ||
+        source is! String ||
+        capturedAtMillis is! int) {
+      return null;
+    }
+
+    return MessageContactLocation(
+      location: LatLng(latitude.toDouble(), longitude.toDouble()),
+      source: source,
+      capturedAt: DateTime.fromMillisecondsSinceEpoch(capturedAtMillis),
+      sourceTimestamp: json['sourceTimestampMillis'] is int
+          ? DateTime.fromMillisecondsSinceEpoch(
+              json['sourceTimestampMillis'] as int,
+            )
+          : null,
+    );
+  }
+}

lib/models/message_reception_details.dart

@@ -0,0 +1,140 @@
+const int _transmitEstimateToleranceMs = 1500;
+
+int? sanitizeEstimatedTransmitMs({
+  required int? estimatedTransmitMs,
+  required int? senderToReceiptMs,
+}) {
+  if (estimatedTransmitMs == null || estimatedTransmitMs <= 0) {
+    return null;
+  }
+
+  if (senderToReceiptMs == null || senderToReceiptMs <= 0) {
+    return estimatedTransmitMs;
+  }
+
+  // Sender timestamps are second-granularity, so allow a small cushion before
+  // treating the estimate as impossible for the observed delivery time.
+  if (estimatedTransmitMs > senderToReceiptMs + _transmitEstimateToleranceMs) {
+    return null;
+  }
+
+  return estimatedTransmitMs;
+}
+
+class MessageReceptionDetails {
+  final DateTime capturedAt;
+  final DateTime? packetLoggedAt;
+  final int? rssiDbm;
+  final double? snrDb;
+  final List<int>? pathBytes;
+  final int? senderToReceiptMs;
+  final int? estimatedTransmitMs;
+  final int? postTransmitDelayMs;
+  final int receivedCopies;
+
+  const MessageReceptionDetails({
+    required this.capturedAt,
+    this.packetLoggedAt,
+    this.rssiDbm,
+    this.snrDb,
+    this.pathBytes,
+    this.senderToReceiptMs,
+    this.estimatedTransmitMs,
+    this.postTransmitDelayMs,
+    this.receivedCopies = 1,
+  });
+
+  String? get pathBytesHex => pathBytes == null || pathBytes!.isEmpty
+      ? null
+      : pathBytes!.map((b) => b.toRadixString(16).padLeft(2, '0')).join(':');
+
+  Map<String, dynamic> toJson() {
+    return {
+      'capturedAtMillis': capturedAt.millisecondsSinceEpoch,
+      'packetLoggedAtMillis': packetLoggedAt?.millisecondsSinceEpoch,
+      'rssiDbm': rssiDbm,
+      'snrDb': snrDb,
+      'pathBytes': pathBytes,
+      'senderToReceiptMs': senderToReceiptMs,
+      'estimatedTransmitMs': estimatedTransmitMs,
+      'postTransmitDelayMs': postTransmitDelayMs,
+      'receivedCopies': receivedCopies,
+    };
+  }
+
+  MessageReceptionDetails copyWith({
+    DateTime? capturedAt,
+    DateTime? packetLoggedAt,
+    int? rssiDbm,
+    double? snrDb,
+    List<int>? pathBytes,
+    int? senderToReceiptMs,
+    int? estimatedTransmitMs,
+    int? postTransmitDelayMs,
+    int? receivedCopies,
+  }) {
+    return MessageReceptionDetails(
+      capturedAt: capturedAt ?? this.capturedAt,
+      packetLoggedAt: packetLoggedAt ?? this.packetLoggedAt,
+      rssiDbm: rssiDbm ?? this.rssiDbm,
+      snrDb: snrDb ?? this.snrDb,
+      pathBytes: pathBytes ?? this.pathBytes,
+      senderToReceiptMs: senderToReceiptMs ?? this.senderToReceiptMs,
+      estimatedTransmitMs: estimatedTransmitMs ?? this.estimatedTransmitMs,
+      postTransmitDelayMs: postTransmitDelayMs ?? this.postTransmitDelayMs,
+      receivedCopies: receivedCopies ?? this.receivedCopies,
+    );
+  }
+
+  static MessageReceptionDetails mergeDuplicate({
+    MessageReceptionDetails? existing,
+    MessageReceptionDetails? incoming,
+  }) {
+    final base =
+        existing ??
+        incoming ??
+        MessageReceptionDetails(capturedAt: DateTime.now());
+
+    return base.copyWith(
+      capturedAt: incoming?.capturedAt ?? existing?.capturedAt,
+      packetLoggedAt: incoming?.packetLoggedAt ?? existing?.packetLoggedAt,
+      rssiDbm: incoming?.rssiDbm ?? existing?.rssiDbm,
+      snrDb: incoming?.snrDb ?? existing?.snrDb,
+      pathBytes: incoming?.pathBytes ?? existing?.pathBytes,
+      senderToReceiptMs:
+          incoming?.senderToReceiptMs ?? existing?.senderToReceiptMs,
+      estimatedTransmitMs:
+          incoming?.estimatedTransmitMs ?? existing?.estimatedTransmitMs,
+      postTransmitDelayMs:
+          incoming?.postTransmitDelayMs ?? existing?.postTransmitDelayMs,
+      receivedCopies:
+          (existing?.receivedCopies ?? 1) + (incoming?.receivedCopies ?? 1),
+    );
+  }
+
+  static MessageReceptionDetails? fromJson(Map<String, dynamic> json) {
+    final capturedAtMillis = json['capturedAtMillis'];
+    if (capturedAtMillis is! int) {
+      return null;
+    }
+
+    final pathBytes = json['pathBytes'];
+    return MessageReceptionDetails(
+      capturedAt: DateTime.fromMillisecondsSinceEpoch(capturedAtMillis),
+      packetLoggedAt: json['packetLoggedAtMillis'] is int
+          ? DateTime.fromMillisecondsSinceEpoch(
+              json['packetLoggedAtMillis'] as int,
+            )
+          : null,
+      rssiDbm: json['rssiDbm'] as int?,
+      snrDb: (json['snrDb'] as num?)?.toDouble(),
+      pathBytes: pathBytes is List
+          ? pathBytes.whereType<num>().map((b) => b.toInt()).toList()
+          : null,
+      senderToReceiptMs: json['senderToReceiptMs'] as int?,
+      estimatedTransmitMs: json['estimatedTransmitMs'] as int?,
+      postTransmitDelayMs: json['postTransmitDelayMs'] as int?,
+      receivedCopies: json['receivedCopies'] as int? ?? 1,
+    );
+  }
+}

lib/models/message_route_metadata.dart

@@ -0,0 +1,79 @@
+import 'path_selection.dart';
+
+class MessageRouteMetadata {
+  final PathSelectionMode mode;
+  final bool routerFallbackAttempted;
+  final String? relayName;
+  final String? relayKey6;
+  final String? canonicalPath;
+  final int? hopCount;
+
+  const MessageRouteMetadata({
+    required this.mode,
+    required this.routerFallbackAttempted,
+    this.relayName,
+    this.relayKey6,
+    this.canonicalPath,
+    this.hopCount,
+  });
+
+  factory MessageRouteMetadata.fromSelection(
+    PathSelection selection, {
+    required bool routerFallbackAttempted,
+  }) {
+    return MessageRouteMetadata(
+      mode: selection.mode,
+      routerFallbackAttempted: routerFallbackAttempted,
+      relayName: selection.relayName,
+      relayKey6: selection.relayKey6,
+      canonicalPath: selection.canonicalPath.isEmpty
+          ? null
+          : selection.canonicalPath,
+      hopCount: selection.hopCount > 0 ? selection.hopCount : null,
+    );
+  }
+
+  String get modeLabel {
+    switch (mode) {
+      case PathSelectionMode.directCurrent:
+        return 'Current direct path';
+      case PathSelectionMode.directHistorical:
+        return 'Rotated direct path';
+      case PathSelectionMode.flood:
+        return 'Flood route';
+      case PathSelectionMode.nearestRouter:
+        final suffix = relayName?.trim().isNotEmpty == true
+            ? ' via $relayName'
+            : relayKey6?.trim().isNotEmpty == true
+            ? ' via $relayKey6'
+            : '';
+        return 'Nearest router$suffix';
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'mode': mode.name,
+      'router_fallback_attempted': routerFallbackAttempted,
+      'relay_name': relayName,
+      'relay_key6': relayKey6,
+      'canonical_path': canonicalPath,
+      'hop_count': hopCount,
+    };
+  }
+
+  factory MessageRouteMetadata.fromJson(Map<String, dynamic> json) {
+    return MessageRouteMetadata(
+      mode: PathSelectionMode.values.firstWhere(
+        (value) => value.name == json['mode'],
+        orElse: () => PathSelectionMode.directCurrent,
+      ),
+      routerFallbackAttempted:
+          json['router_fallback_attempted'] as bool? ?? false,
+      relayName: json['relay_name'] as String?,
+      relayKey6: json['relay_key6'] as String?,
+      canonicalPath: json['canonical_path'] as String?,
+      hopCount: json['hop_count'] as int?,
+    );
+  }
+}

lib/models/message_transfer_details.dart

@@ -0,0 +1,142 @@
+class MessageTransferDownloader {
+  final String requesterKey6;
+  final String? requesterName;
+  final int transferCount;
+  final DateTime lastTransferredAt;
+
+  const MessageTransferDownloader({
+    required this.requesterKey6,
+    this.requesterName,
+    required this.transferCount,
+    required this.lastTransferredAt,
+  });
+
+  MessageTransferDownloader copyWith({
+    String? requesterKey6,
+    String? requesterName,
+    int? transferCount,
+    DateTime? lastTransferredAt,
+  }) {
+    return MessageTransferDownloader(
+      requesterKey6: requesterKey6 ?? this.requesterKey6,
+      requesterName: requesterName ?? this.requesterName,
+      transferCount: transferCount ?? this.transferCount,
+      lastTransferredAt: lastTransferredAt ?? this.lastTransferredAt,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'requesterKey6': requesterKey6,
+      'requesterName': requesterName,
+      'transferCount': transferCount,
+      'lastTransferredAtMillis': lastTransferredAt.millisecondsSinceEpoch,
+    };
+  }
+
+  static MessageTransferDownloader? fromJson(Map<String, dynamic> json) {
+    final requesterKey6 = json['requesterKey6'];
+    final transferCount = json['transferCount'];
+    final lastTransferredAtMillis = json['lastTransferredAtMillis'];
+    if (requesterKey6 is! String ||
+        transferCount is! int ||
+        lastTransferredAtMillis is! int) {
+      return null;
+    }
+
+    return MessageTransferDownloader(
+      requesterKey6: requesterKey6,
+      requesterName: json['requesterName'] as String?,
+      transferCount: transferCount,
+      lastTransferredAt: DateTime.fromMillisecondsSinceEpoch(
+        lastTransferredAtMillis,
+      ),
+    );
+  }
+}
+
+class MessageTransferDetails {
+  final int totalTransfers;
+  final List<MessageTransferDownloader> downloaders;
+
+  const MessageTransferDetails({
+    required this.totalTransfers,
+    required this.downloaders,
+  });
+
+  const MessageTransferDetails.empty()
+    : totalTransfers = 0,
+      downloaders = const [];
+
+  MessageTransferDetails registerTransfer({
+    required String requesterKey6,
+    String? requesterName,
+    DateTime? transferredAt,
+  }) {
+    final eventAt = transferredAt ?? DateTime.now();
+    final normalizedName = requesterName?.trim();
+    final updatedDownloaders = List<MessageTransferDownloader>.from(
+      downloaders,
+    );
+    final index = updatedDownloaders.indexWhere(
+      (entry) => entry.requesterKey6 == requesterKey6,
+    );
+
+    if (index == -1) {
+      updatedDownloaders.add(
+        MessageTransferDownloader(
+          requesterKey6: requesterKey6,
+          requesterName: normalizedName?.isEmpty ?? true
+              ? null
+              : normalizedName,
+          transferCount: 1,
+          lastTransferredAt: eventAt,
+        ),
+      );
+    } else {
+      final existing = updatedDownloaders[index];
+      updatedDownloaders[index] = existing.copyWith(
+        requesterName: normalizedName?.isEmpty ?? true
+            ? existing.requesterName
+            : normalizedName,
+        transferCount: existing.transferCount + 1,
+        lastTransferredAt: eventAt,
+      );
+    }
+
+    updatedDownloaders.sort(
+      (a, b) => b.lastTransferredAt.compareTo(a.lastTransferredAt),
+    );
+
+    return MessageTransferDetails(
+      totalTransfers: totalTransfers + 1,
+      downloaders: updatedDownloaders,
+    );
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'totalTransfers': totalTransfers,
+      'downloaders': downloaders.map((entry) => entry.toJson()).toList(),
+    };
+  }
+
+  static MessageTransferDetails? fromJson(Map<String, dynamic> json) {
+    final totalTransfers = json['totalTransfers'];
+    if (totalTransfers is! int) {
+      return null;
+    }
+
+    final rawDownloaders = json['downloaders'] as List<dynamic>? ?? const [];
+    final downloaders = rawDownloaders
+        .whereType<Map<String, dynamic>>()
+        .map(MessageTransferDownloader.fromJson)
+        .whereType<MessageTransferDownloader>()
+        .toList();
+
+    return MessageTransferDetails(
+      totalTransfers: totalTransfers,
+      downloaders: downloaders,
+    );
+  }
+}

lib/models/path_selection.dart

@@ -0,0 +1,65 @@
+import 'dart:typed_data';
+
+enum PathSelectionMode { directCurrent, directHistorical, flood, nearestRouter }
+
+class PathSelection {
+  final PathSelectionMode mode;
+  final Uint8List pathBytes;
+  final int hopCount;
+  final int hashSize;
+  final String? relayName;
+  final String? relayKey6;
+
+  const PathSelection({
+    required this.mode,
+    required this.pathBytes,
+    required this.hopCount,
+    required this.hashSize,
+    this.relayName,
+    this.relayKey6,
+  });
+
+  PathSelection.flood()
+    : mode = PathSelectionMode.flood,
+      pathBytes = Uint8List(0),
+      hopCount = -1,
+      hashSize = 1,
+      relayName = null,
+      relayKey6 = null;
+
+  bool get usesFlood => mode == PathSelectionMode.flood;
+  bool get hasDirectPath => !usesFlood && pathBytes.isNotEmpty && hopCount > 0;
+
+  String get canonicalPath {
+    if (!hasDirectPath) return '';
+    final hops = <String>[];
+    for (var index = 0; index < pathBytes.length; index += hashSize) {
+      hops.add(
+        pathBytes
+            .sublist(index, index + hashSize)
+            .map((byte) => byte.toRadixString(16).padLeft(2, '0'))
+            .join()
+            .toUpperCase(),
+      );
+    }
+    return hops.join(',');
+  }
+
+  PathSelection copyWith({
+    PathSelectionMode? mode,
+    Uint8List? pathBytes,
+    int? hopCount,
+    int? hashSize,
+    String? relayName,
+    String? relayKey6,
+  }) {
+    return PathSelection(
+      mode: mode ?? this.mode,
+      pathBytes: pathBytes ?? this.pathBytes,
+      hopCount: hopCount ?? this.hopCount,
+      hashSize: hashSize ?? this.hashSize,
+      relayName: relayName ?? this.relayName,
+      relayKey6: relayKey6 ?? this.relayKey6,
+    );
+  }
+}

lib/models/room_login_state.dart

@@ -0,0 +1,111 @@
+import 'dart:typed_data';
+
+/// Represents the login state for a room
+class RoomLoginState {
+  final Uint8List publicKeyPrefix;
+  final bool isLoggedIn;
+  final bool isAdmin;
+  final int permissions;
+  final int? tag;
+  final DateTime? loginTime;
+  final bool hasPassword; // Whether we have a saved password
+
+  const RoomLoginState({
+    required this.publicKeyPrefix,
+    this.isLoggedIn = false,
+    this.isAdmin = false,
+    this.permissions = 0,
+    this.tag,
+    this.loginTime,
+    this.hasPassword = false,
+  });
+
+  /// Create a logged-in state
+  factory RoomLoginState.loggedIn({
+    required Uint8List publicKeyPrefix,
+    required int permissions,
+    required bool isAdmin,
+    required int tag,
+    required bool hasPassword,
+  }) {
+    return RoomLoginState(
+      publicKeyPrefix: publicKeyPrefix,
+      isLoggedIn: true,
+      isAdmin: isAdmin,
+      permissions: permissions,
+      tag: tag,
+      loginTime: DateTime.now(),
+      hasPassword: hasPassword,
+    );
+  }
+
+  /// Create a logged-out state
+  factory RoomLoginState.loggedOut({
+    required Uint8List publicKeyPrefix,
+    bool hasPassword = false,
+  }) {
+    return RoomLoginState(
+      publicKeyPrefix: publicKeyPrefix,
+      isLoggedIn: false,
+      hasPassword: hasPassword,
+    );
+  }
+
+  /// Copy with modified fields
+  RoomLoginState copyWith({
+    Uint8List? publicKeyPrefix,
+    bool? isLoggedIn,
+    bool? isAdmin,
+    int? permissions,
+    int? tag,
+    DateTime? loginTime,
+    bool? hasPassword,
+  }) {
+    return RoomLoginState(
+      publicKeyPrefix: publicKeyPrefix ?? this.publicKeyPrefix,
+      isLoggedIn: isLoggedIn ?? this.isLoggedIn,
+      isAdmin: isAdmin ?? this.isAdmin,
+      permissions: permissions ?? this.permissions,
+      tag: tag ?? this.tag,
+      loginTime: loginTime ?? this.loginTime,
+      hasPassword: hasPassword ?? this.hasPassword,
+    );
+  }
+
+  /// Get formatted public key prefix (e.g., "15:59:89:54:b4:d4")
+  String get publicKeyPrefixHex {
+    return publicKeyPrefix
+        .map((b) => b.toRadixString(16).padLeft(2, '0'))
+        .join(':');
+  }
+
+  /// Get login duration if logged in
+  Duration? get loginDuration {
+    if (!isLoggedIn || loginTime == null) return null;
+    return DateTime.now().difference(loginTime!);
+  }
+
+  /// Get formatted login duration (e.g., "2h 15m ago")
+  String? get loginDurationFormatted {
+    final duration = loginDuration;
+    if (duration == null) return null;
+
+    if (duration.inMinutes < 1) {
+      return 'just now';
+    } else if (duration.inMinutes < 60) {
+      return '${duration.inMinutes}m ago';
+    } else if (duration.inHours < 24) {
+      final hours = duration.inHours;
+      final minutes = duration.inMinutes % 60;
+      return minutes > 0 ? '${hours}h ${minutes}m ago' : '${hours}h ago';
+    } else {
+      final days = duration.inDays;
+      return '${days}d ago';
+    }
+  }
+
+  @override
+  String toString() {
+    return 'RoomLoginState(prefix: $publicKeyPrefixHex, loggedIn: $isLoggedIn, admin: $isAdmin, hasPassword: $hasPassword)';
+  }
+}

lib/models/sar_marker.dart

@@ -0,0 +1,209 @@
+import 'dart:typed_data';
+import 'package:flutter/material.dart';
+import 'package:latlong2/latlong.dart';
+import '../l10n/app_localizations.dart';
+import 'map_coordinate_space.dart';
+import '../services/sar_template_service.dart';
+
+/// SAR (Search & Rescue) marker types
+enum SarMarkerType {
+  foundPerson('🧑', 'Found Person'),
+  fire('🔥', 'Fire'),
+  stagingArea('🏕️', 'Staging Area'),
+  object('📦', 'Object'),
+  unknown('❓', 'Unknown');
+
+  const SarMarkerType(this.emoji, this.displayName);
+  final String emoji;
+  final String displayName;
+
+  /// Get localized display name
+  String getLocalizedName(BuildContext context) {
+    final l10n = AppLocalizations.of(context)!;
+    switch (this) {
+      case SarMarkerType.foundPerson:
+        return l10n.sarMarkerFoundPerson;
+      case SarMarkerType.fire:
+        return l10n.sarMarkerFire;
+      case SarMarkerType.stagingArea:
+        return l10n.sarMarkerStagingArea;
+      case SarMarkerType.object:
+        return l10n.sarMarkerObject;
+      case SarMarkerType.unknown:
+        return 'Unknown';
+    }
+  }
+
+  static SarMarkerType fromEmoji(String emoji) {
+    switch (emoji) {
+      case '🧑':
+      case '👤':
+        return SarMarkerType.foundPerson;
+      case '🔥':
+        return SarMarkerType.fire;
+      case '🏕️':
+      case '⛺':
+        return SarMarkerType.stagingArea;
+      case '📦':
+        return SarMarkerType.object;
+      default:
+        return SarMarkerType.unknown;
+    }
+  }
+
+  /// Get map marker color
+  String get markerColor {
+    switch (this) {
+      case SarMarkerType.foundPerson:
+        return '#4CAF50'; // Green
+      case SarMarkerType.fire:
+        return '#F44336'; // Red
+      case SarMarkerType.stagingArea:
+        return '#2196F3'; // Blue
+      case SarMarkerType.object:
+        return '#9C27B0'; // Purple
+      default:
+        return '#9E9E9E'; // Gray
+    }
+  }
+}
+
+/// SAR marker from special messages
+class SarMarker {
+  final String id;
+  final SarMarkerType type;
+  final LatLng location;
+  final DateTime timestamp;
+  final Uint8List? senderPublicKey;
+  final String? senderName;
+  final String? notes;
+  final String? customEmoji; // For custom SAR markers not in predefined types
+  final int? colorIndex; // Color index (0-7) from standard palette
+  final MapCoordinateSpace coordinateSpace;
+  final String? mapId;
+
+  SarMarker({
+    required this.id,
+    required this.type,
+    required this.location,
+    required this.timestamp,
+    this.senderPublicKey,
+    this.senderName,
+    this.notes,
+    this.customEmoji,
+    this.colorIndex,
+    this.coordinateSpace = MapCoordinateSpace.geo,
+    this.mapId,
+  });
+
+  bool get isCustomMapMarker =>
+      coordinateSpace == MapCoordinateSpace.customMap && mapId != null;
+
+  /// Get sender public key as hex string (short)
+  String? get senderKeyShort {
+    if (senderPublicKey == null || senderPublicKey!.length < 8) return null;
+    return senderPublicKey!
+        .sublist(0, 8)
+        .map((b) => b.toRadixString(16).padLeft(2, '0'))
+        .join('');
+  }
+
+  /// Get friendly time since marker was created
+  String get timeAgo {
+    final diff = DateTime.now().difference(timestamp);
+    if (diff.inMinutes < 1) return 'Just now';
+    if (diff.inMinutes < 60) return '${diff.inMinutes}m ago';
+    if (diff.inHours < 24) return '${diff.inHours}h ago';
+    return '${diff.inDays}d ago';
+  }
+
+  /// Check if marker is recent (within last hour)
+  bool get isRecent {
+    return DateTime.now().difference(timestamp).inHours < 1;
+  }
+
+  /// Get the emoji to display (custom emoji if available, otherwise type emoji)
+  String get emoji {
+    return customEmoji ?? type.emoji;
+  }
+
+  /// Get display name - uses notes if available, otherwise looks up template by emoji, otherwise type name
+  String get displayName {
+    if (notes != null && notes!.isNotEmpty) {
+      return notes!;
+    }
+
+    // If no notes and we have a custom emoji, try to look up the template
+    if (customEmoji != null) {
+      // Import the service here to avoid circular dependencies
+      // We'll use a static lookup method
+      return _lookupTemplateNameByEmoji(customEmoji!) ?? type.displayName;
+    }
+
+    return type.displayName;
+  }
+
+  /// Look up template name by emoji from SarTemplateService
+  static String? _lookupTemplateNameByEmoji(String emoji) {
+    try {
+      // Use the singleton instance
+      final service = SarTemplateService();
+      if (!service.isInitialized) {
+        return null;
+      }
+
+      // Find template with matching emoji
+      final template = service.templates.firstWhere(
+        (t) => t.emoji == emoji,
+        orElse: () => throw StateError('No template found'),
+      );
+
+      return template.name;
+    } catch (e) {
+      // Template not found or service not initialized
+      return null;
+    }
+  }
+
+  SarMarker copyWith({
+    String? id,
+    SarMarkerType? type,
+    LatLng? location,
+    DateTime? timestamp,
+    Uint8List? senderPublicKey,
+    String? senderName,
+    String? notes,
+    String? customEmoji,
+    int? colorIndex,
+    MapCoordinateSpace? coordinateSpace,
+    String? mapId,
+  }) {
+    return SarMarker(
+      id: id ?? this.id,
+      type: type ?? this.type,
+      location: location ?? this.location,
+      timestamp: timestamp ?? this.timestamp,
+      senderPublicKey: senderPublicKey ?? this.senderPublicKey,
+      senderName: senderName ?? this.senderName,
+      notes: notes ?? this.notes,
+      customEmoji: customEmoji ?? this.customEmoji,
+      colorIndex: colorIndex ?? this.colorIndex,
+      coordinateSpace: coordinateSpace ?? this.coordinateSpace,
+      mapId: mapId ?? this.mapId,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'SarMarker(type: ${type.displayName}, location: $location, sender: $senderName, time: $timeAgo)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    return other is SarMarker && id == other.id;
+  }
+
+  @override
+  int get hashCode => id.hashCode;
+}

lib/models/sar_template.dart

@@ -0,0 +1,302 @@
+import 'package:flutter/material.dart';
+import '../l10n/app_localizations.dart';
+
+/// SAR Template - Customizable template for SAR (Cursor on Target) messages
+class SarTemplate {
+  final String id;
+  final String emoji;
+  final String name;
+  final String description;
+  final String colorHex;
+  final bool isDefault;
+
+  /// Standard color palette for SAR markers (index 0-7)
+  /// This palette is used for transmission to ensure consistent colors across devices
+  static const List<String> colorPalette = [
+    '#F44336', // 0 - Red
+    '#2196F3', // 1 - Blue
+    '#4CAF50', // 2 - Green
+    '#FFC107', // 3 - Yellow
+    '#FF9800', // 4 - Orange
+    '#9C27B0', // 5 - Purple
+    '#E91E63', // 6 - Pink
+    '#00BCD4', // 7 - Cyan
+  ];
+
+  SarTemplate({
+    required this.id,
+    required this.emoji,
+    required this.name,
+    required this.description,
+    required this.colorHex,
+    this.isDefault = false,
+  });
+
+  /// Get color from hex string
+  Color get color {
+    final hexCode = colorHex.replaceAll('#', '');
+    return Color(int.parse('FF$hexCode', radix: 16));
+  }
+
+  /// Get localized display name for this template
+  /// Returns localized name for default templates, or the stored name for custom templates
+  String getLocalizedName(BuildContext context) {
+    final l10n = AppLocalizations.of(context);
+    if (l10n == null) return name;
+
+    // Return localized names for default templates
+    switch (id) {
+      case 'default_found_person':
+        return l10n.sarMarkerFoundPerson;
+      case 'default_fire':
+        return l10n.sarMarkerFire;
+      case 'default_staging_area':
+        return l10n.sarMarkerStagingArea;
+      case 'default_object':
+        return l10n.sarMarkerObject;
+      default:
+        // For custom templates, return the stored name
+        return name;
+    }
+  }
+
+  /// Get the closest color index from the standard palette
+  /// Returns 0-7 for standard colors, or the closest match
+  int getColorIndex() {
+    // Normalize both colors to uppercase for comparison
+    final normalizedColorHex = colorHex.toUpperCase();
+
+    // Check for exact match first
+    for (int i = 0; i < colorPalette.length; i++) {
+      if (colorPalette[i].toUpperCase() == normalizedColorHex) {
+        return i;
+      }
+    }
+
+    // If no exact match, find closest color by calculating distance
+    // Parse RGB values
+    final hexCode = colorHex.replaceAll('#', '');
+    final r = int.parse(hexCode.substring(0, 2), radix: 16);
+    final g = int.parse(hexCode.substring(2, 4), radix: 16);
+    final b = int.parse(hexCode.substring(4, 6), radix: 16);
+
+    int closestIndex = 0;
+    double minDistance = double.infinity;
+
+    for (int i = 0; i < colorPalette.length; i++) {
+      final paletteHex = colorPalette[i].replaceAll('#', '');
+      final pr = int.parse(paletteHex.substring(0, 2), radix: 16);
+      final pg = int.parse(paletteHex.substring(2, 4), radix: 16);
+      final pb = int.parse(paletteHex.substring(4, 6), radix: 16);
+
+      // Calculate Euclidean distance in RGB space
+      final distance = ((r - pr) * (r - pr) + (g - pg) * (g - pg) + (b - pb) * (b - pb)).toDouble();
+
+      if (distance < minDistance) {
+        minDistance = distance;
+        closestIndex = i;
+      }
+    }
+
+    return closestIndex;
+  }
+
+  /// Get color hex from palette index
+  static String getColorFromIndex(int index) {
+    if (index < 0 || index >= colorPalette.length) {
+      return '#9E9E9E'; // Gray for invalid index
+    }
+    return colorPalette[index];
+  }
+
+  /// Create from JSON
+  factory SarTemplate.fromJson(Map<String, dynamic> json) {
+    return SarTemplate(
+      id: json['id'] as String,
+      emoji: json['emoji'] as String,
+      name: json['name'] as String,
+      description: json['description'] as String? ?? '',
+      colorHex: json['colorHex'] as String,
+      isDefault: json['isDefault'] as bool? ?? false,
+    );
+  }
+
+  /// Convert to JSON
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'emoji': emoji,
+      'name': name,
+      'description': description,
+      'colorHex': colorHex,
+      'isDefault': isDefault,
+    };
+  }
+
+  /// Create from SAR message format (S:emoji:0,0:description)
+  /// Example: S:🧑:0,0:Person found
+  factory SarTemplate.fromSarMessage(String message) {
+    final trimmed = message.trim();
+    if (!trimmed.startsWith('S:')) {
+      throw FormatException('SAR message must start with "S:"');
+    }
+
+    // Parse format: S:emoji:lat,lon:description
+    final parts = trimmed.split(':');
+    if (parts.length < 3) {
+      throw FormatException('Invalid SAR message format');
+    }
+
+    final emoji = parts[1].trim();
+    if (emoji.isEmpty) {
+      throw FormatException('Emoji cannot be empty');
+    }
+
+    // Extract description (everything after the third colon)
+    String description = '';
+    if (parts.length > 3) {
+      description = parts.sublist(3).join(':').trim();
+    }
+
+    // Generate ID from emoji + description
+    final id = '${emoji}_${DateTime.now().millisecondsSinceEpoch}';
+
+    // Auto-assign color based on emoji
+    String colorHex = _getColorForEmoji(emoji);
+
+    return SarTemplate(
+      id: id,
+      emoji: emoji,
+      name: description.isNotEmpty ? description : emoji,
+      description: description,
+      colorHex: colorHex,
+      isDefault: false,
+    );
+  }
+
+  /// Convert to SAR message format with placeholder coordinates
+  /// New format: S:emoji:colorIndex:0,0:description
+  /// Example: S:🧑:2:0,0:Person found (2 = Green)
+  String toSarMessage() {
+    final colorIndex = getColorIndex();
+    if (description.isNotEmpty) {
+      return 'S:$emoji:$colorIndex:0,0:$description';
+    }
+    return 'S:$emoji:$colorIndex:0,0';
+  }
+
+  /// Auto-assign color based on emoji (uses standard color palette)
+  static String _getColorForEmoji(String emoji) {
+    // Default emoji to color mapping using standard palette
+    final colorMap = {
+      // Green (index 2) - Person, Safe, Nature
+      '🧑': colorPalette[2],
+      '👤': colorPalette[2],
+      '✅': colorPalette[2],
+      '🌲': colorPalette[2],
+
+      // Red (index 0) - Fire, Hazard, Medical, Emergency
+      '🔥': colorPalette[0],
+      '🚒': colorPalette[0],
+      '🚑': colorPalette[0],
+      '❌': colorPalette[0],
+      '🏥': colorPalette[0],
+
+      // Orange (index 4) - Staging, Assembly
+      '🏕️': colorPalette[4],
+      '⛺': colorPalette[4],
+
+      // Purple (index 5) - Objects
+      '📦': colorPalette[5],
+
+      // Blue (index 1) - Water, Air support
+      '🚁': colorPalette[1],
+      '💧': colorPalette[1],
+
+      // Yellow (index 3) - Warning, Caution
+      '⚠️': colorPalette[3],
+    };
+
+    return colorMap[emoji] ?? '#9E9E9E'; // Default gray for unknown emojis
+  }
+
+  /// Copy with modifications
+  SarTemplate copyWith({
+    String? id,
+    String? emoji,
+    String? name,
+    String? description,
+    String? colorHex,
+    bool? isDefault,
+  }) {
+    return SarTemplate(
+      id: id ?? this.id,
+      emoji: emoji ?? this.emoji,
+      name: name ?? this.name,
+      description: description ?? this.description,
+      colorHex: colorHex ?? this.colorHex,
+      isDefault: isDefault ?? this.isDefault,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'SarTemplate(id: $id, emoji: $emoji, name: $name, description: $description)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+    return other is SarTemplate && id == other.id;
+  }
+
+  @override
+  int get hashCode => id.hashCode;
+
+  /// Default templates (uses standard color palette)
+  /// Colors reference:
+  /// - 0 Red (#F44336) - Fire, Hazard, Medical
+  /// - 1 Blue (#2196F3) - Water, Helicopter
+  /// - 2 Green (#4CAF50) - Found Person, Safe
+  /// - 3 Yellow (#FFC107) - Warning
+  /// - 4 Orange (#FF9800) - Staging Area
+  /// - 5 Purple (#9C27B0) - Object
+  /// - 6 Pink (#E91E63) - Reserved
+  /// - 7 Cyan (#00BCD4) - Reserved
+  static List<SarTemplate> get defaults {
+    return [
+      SarTemplate(
+        id: 'default_found_person',
+        emoji: '🧑',
+        name: 'Found Person',
+        description: '',
+        colorHex: colorPalette[2], // Green
+        isDefault: true,
+      ),
+      SarTemplate(
+        id: 'default_fire',
+        emoji: '🔥',
+        name: 'Fire',
+        description: '',
+        colorHex: colorPalette[0], // Red
+        isDefault: true,
+      ),
+      SarTemplate(
+        id: 'default_staging_area',
+        emoji: '🏕️',
+        name: 'Staging Area',
+        description: '',
+        colorHex: colorPalette[4], // Orange
+        isDefault: true,
+      ),
+      SarTemplate(
+        id: 'default_object',
+        emoji: '📦',
+        name: 'Object',
+        description: '',
+        colorHex: colorPalette[5], // Purple
+        isDefault: true,
+      ),
+    ];
+  }
+}

lib/models/sent_message_tracker.dart

@@ -0,0 +1 @@
+export 'package:meshcore_client/meshcore_client.dart' show SentMessageTracker;

lib/models/update_info.dart

@@ -0,0 +1,52 @@
+/// Information about an available app update
+class UpdateInfo {
+  final bool isAvailable;
+  final String currentCommitHash;
+  final String? latestCommitHash;
+  final String? downloadUrl;
+  final String? buildId;
+  final String? timestamp;
+
+  const UpdateInfo({
+    required this.isAvailable,
+    required this.currentCommitHash,
+    this.latestCommitHash,
+    this.downloadUrl,
+    this.buildId,
+    this.timestamp,
+  });
+
+  /// Factory constructor for when no update is available
+  factory UpdateInfo.noUpdate(String currentCommitHash) {
+    return UpdateInfo(
+      isAvailable: false,
+      currentCommitHash: currentCommitHash,
+    );
+  }
+
+  /// Factory constructor for when an update is available
+  factory UpdateInfo.available({
+    required String currentCommitHash,
+    required String latestCommitHash,
+    required String downloadUrl,
+    String? buildId,
+    String? timestamp,
+  }) {
+    return UpdateInfo(
+      isAvailable: true,
+      currentCommitHash: currentCommitHash,
+      latestCommitHash: latestCommitHash,
+      downloadUrl: downloadUrl,
+      buildId: buildId,
+      timestamp: timestamp,
+    );
+  }
+
+  @override
+  String toString() {
+    return 'UpdateInfo(isAvailable: $isAvailable, '
+        'current: $currentCommitHash, '
+        'latest: $latestCommitHash, '
+        'downloadUrl: $downloadUrl)';
+  }
+}