Multibyte: fix map

lib/connector/meshcore_connector.dart

@@ -2864,7 +2864,8 @@ class MeshCoreConnector extends ChangeNotifier {
         : updatedFlags;
 
     final mode = _pathHashByteWidth - 1;
-    final encodedPathLen = (latestContact.pathLength >= 0 && latestContact.pathLength != 0xFF)
+    final encodedPathLen =
+        (latestContact.pathLength >= 0 && latestContact.pathLength != 0xFF)
         ? (latestContact.pathLength | (mode << 6))
         : latestContact.pathLength;
     await sendFrame(
@@ -3208,7 +3209,8 @@ class MeshCoreConnector extends ChangeNotifier {
     if (!isConnected) return;
 
     final mode = _pathHashByteWidth - 1;
-    final encodedPathLen = (contact.pathLength >= 0 && contact.pathLength != 0xFF)
+    final encodedPathLen =
+        (contact.pathLength >= 0 && contact.pathLength != 0xFF)
         ? (contact.pathLength | (mode << 6))
         : contact.pathLength;
     await sendFrame(
@@ -6089,7 +6091,9 @@ class MeshCoreConnector extends ChangeNotifier {
         publicKey: publicKey,
         name: name,
         type: type,
-        pathLength: pathBytes.isEmpty ? -1 : (pathBytes.length ~/ pathHashWidth),
+        pathLength: pathBytes.isEmpty
+            ? -1
+            : (pathBytes.length ~/ pathHashWidth),
         path: Uint8List.fromList(
           pathBytes.reversed.toList(),
         ), // Store path in reverse for easier use in outgoing messages

lib/screens/channels_screen.dart

@@ -301,8 +301,7 @@ class _ChannelsScreenState extends State<ChannelsScreen>
                           ),
                           buildDefaultDragHandles: false,
                           itemCount: filteredChannels.length,
-                          onReorder: (oldIndex, newIndex) {
+                          onReorderItem: (oldIndex, newIndex) {
-                            if (newIndex > oldIndex) newIndex -= 1;
                             final reordered = List<Channel>.from(
                               filteredChannels,
                             );

lib/screens/map_screen.dart

@@ -70,6 +70,7 @@ class _MapScreenState extends State<MapScreen> {
   bool _hasInitializedMap = false;
   bool _removedMarkersLoaded = false;
   final List<int> _pathTrace = [];
+  final List<int> _pathTraceHopWidths = [];
   final List<Contact> _pathTraceContacts = [];
   final List<LatLng> _points = [];
   final List<Polyline> _polylines = [];
@@ -2302,11 +2303,12 @@ class _MapScreenState extends State<MapScreen> {
     final hopWidth = min(
       connector.pathHashByteWidth.clamp(1, pubKeySize),
       contact.publicKey.length,
-    );
+    ).toInt();
     setState(() {
       _pathTrace.addAll(
         contact.publicKey.sublist(0, hopWidth),
       ); // Add the hop-width prefix of the public key to the trace
+      _pathTraceHopWidths.add(hopWidth);
       _pathTraceContacts.add(
         contact.copyWith(
           latitude: position?.latitude ?? contact.latitude,
@@ -2321,6 +2323,7 @@ class _MapScreenState extends State<MapScreen> {
     setState(() {
       _isBuildingPathTrace = true;
       _pathTrace.clear();
+      _pathTraceHopWidths.clear();
       _pathTraceContacts.clear();
       _points.clear();
       _polylines.clear();
@@ -2330,8 +2333,19 @@ class _MapScreenState extends State<MapScreen> {
 
   void _removePath() {
     setState(() {
+      final recordedHopWidth = _pathTraceHopWidths.isNotEmpty
+          ? _pathTraceHopWidths.removeLast()
+          : context.read<MeshCoreConnector>().pathHashByteWidth.clamp(
+              1,
+              pubKeySize,
+            );
+      final hopByteCount = min(recordedHopWidth, _pathTrace.length).toInt();
       _pathTraceContacts.removeLast();
-      _pathTrace.removeLast(); // Remove last node from path trace
+      // A path trace hop can be wider than one byte; remove the full hash prefix.
+      _pathTrace.removeRange(
+        _pathTrace.length - hopByteCount,
+        _pathTrace.length,
+      );
       _points.removeLast(); // Remove last point from points list
       _polylines.clear(); // Clear polylines
     });
@@ -2445,6 +2459,7 @@ class _MapScreenState extends State<MapScreen> {
                         setState(() {
                           _isBuildingPathTrace = false;
                           _pathTrace.clear();
+                          _pathTraceHopWidths.clear();
                           _points.clear();
                           _polylines.clear();
                         });

lib/screens/path_trace_map.dart

@@ -115,9 +115,10 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
   Uint8List? _sentTagBytes;
 
   String _formatPathPrefixes(Uint8List pathBytes) {
-    return PathHelper.splitPathBytes(pathBytes, widget.pathHashByteWidth)
+    return PathHelper.splitPathBytes(
-      .map(PathHelper.formatHopHex)
+      pathBytes,
-        .join(',');
+      widget.pathHashByteWidth,
+    ).map(PathHelper.formatHopHex).join(',');
   }
 
   @override
@@ -327,7 +328,8 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
         // Check if it's a binary response
         if (frame.length >= 12 &&
             code == pushCodeTraceData &&
-            (listEquals(frame.sublist(4, 8), _sentTagBytes) || listEquals(frame.sublist(4, 8), tagData))) {
+            (listEquals(frame.sublist(4, 8), _sentTagBytes) ||
+                listEquals(frame.sublist(4, 8), tagData))) {
           _timeoutTimer?.cancel();
           if (!mounted) return;
           _handleTraceResponse(frame);
@@ -370,10 +372,7 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
       buffer.skipBytes(5); // Skip Flag byte and tag data
       buffer.skipBytes(4); // Skip auth code
       final pathBytes = buffer.readBytes(pathLength);
-      final pathData = PathHelper.splitPathBytes(
+      final pathData = PathHelper.splitPathBytes(pathBytes, width);
-        pathBytes,
-        width,
-      );
       List<double> snrData = buffer
           .readRemainingBytes()
           .map((snr) => snr.toSigned(8).toDouble() / 4)
@@ -414,7 +413,10 @@ class _PathTraceMapScreenState extends State<PathTraceMapScreen> {
           for (final repeaterData in pathData) {
             final hopWidth = repeaterData.length;
             if (repeater.publicKey.length < hopWidth) continue;
-            if (listEquals(repeater.publicKey.sublist(0, hopWidth), repeaterData)) {
+            if (listEquals(
+              repeater.publicKey.sublist(0, hopWidth),
+              repeaterData,
+            )) {
               pathContacts[_hopKey(repeaterData)] = repeater;
               lastContact = repeater;
             }

test/helpers/path_helper_test.dart

@@ -31,7 +31,9 @@ void main() {
     expect(PathHelper.formatHopHex(hops.first), equals('A1A2'));
   });
 
-  test('resolvePathNames ignores chat nodes and keeps repeater/room nodes with 1-byte paths', () {
+  test(
+    'resolvePathNames ignores chat nodes and keeps repeater/room nodes with 1-byte paths',
+    () {
       final contacts = [
         _contact(firstByte: 0xF2, name: 'MunTui', type: advTypeChat),
         _contact(firstByte: 0x7E, name: 'zrepeater', type: advTypeRepeater),
@@ -45,7 +47,8 @@ void main() {
       );
 
       expect(resolved, equals('F2 → zrepeater → USS Ronald Reagan'));
-  });
+    },
+  );
 
   test('resolvePathNames supports multi-byte paths', () {
     final contacts = [

test/models/model_changes_test.dart

@@ -6,7 +6,6 @@ import 'package:shared_preferences/shared_preferences.dart';
 import 'package:meshcore_open/connector/meshcore_protocol.dart';
 import 'package:meshcore_open/models/channel_message.dart';
 import 'package:meshcore_open/models/contact.dart';
-import 'package:meshcore_open/models/message.dart';
 import 'package:meshcore_open/models/path_history.dart';
 import 'package:meshcore_open/models/app_settings.dart';
 import 'package:meshcore_open/storage/prefs_manager.dart';
@@ -65,9 +64,7 @@ Uint8List _buildChannelMessageFrameV3({
 
   if (hasPath && hopCount > 0) {
     writer.add(
-      Uint8List.fromList(
+      Uint8List.fromList(List.generate(hopCount * pathHashWidth, (i) => i + 1)),
-        List.generate(hopCount * pathHashWidth, (i) => i + 1),
-      ),
     );
   }
 
@@ -81,7 +78,8 @@ Uint8List _buildChannelMessageFrameV3({
 
 void main() {
   group('ChannelMessage.fromFrame — V3 packed path decoding', () {
-    test('hasPath reads width, hop count, path bytes, and txtType correctly',
+    test(
+      'hasPath reads width, hop count, path bytes, and txtType correctly',
       () {
         final frame = _buildChannelMessageFrameV3(
           pathHashWidth: 2,
@@ -97,7 +95,8 @@ void main() {
         expect(message.pathBytes.length, equals(6));
         expect(message.senderName, equals('Alice'));
         expect(message.text, equals('Hello world'));
-    });
+      },
+    );
 
     test('no path still reads width, hop count, and txtType correctly', () {
       final frame = _buildChannelMessageFrameV3(
@@ -473,7 +472,9 @@ void main() {
       await PrefsManager.initialize();
     });
 
-    test('ContactStore decodes and migrates legacy mode-encoded paths', () async {
+    test(
+      'ContactStore decodes and migrates legacy mode-encoded paths',
+      () async {
         final store = ContactStore()..publicKeyHex = '1234567890';
 
         // Let's create a contact with legacy 64 path length (mode 1, 0 hops)
@@ -489,7 +490,7 @@ void main() {
             'lastSeen': DateTime.now().millisecondsSinceEpoch,
             'lastMessageAt': DateTime.now().millisecondsSinceEpoch,
             'isActive': true,
-        }
+          },
         ];
 
         final prefs = PrefsManager.instance;
@@ -499,13 +500,18 @@ void main() {
         expect(contacts, hasLength(1));
         expect(contacts.first.pathLength, equals(0));
         expect(contacts.first.path, isEmpty);
-    });
+      },
+    );
 
-    test('ContactStore decodes and migrates legacy mode-1 paths with hops', () async {
+    test(
+      'ContactStore decodes and migrates legacy mode-1 paths with hops',
+      () async {
         final store = ContactStore()..publicKeyHex = '1234567890';
 
         // Contact with legacy 65 path length (mode 1, 1 hop)
-      final rawPath = Uint8List(64)..[0] = 0xBB..[1] = 0xCC; 
+        final rawPath = Uint8List(64)
+          ..[0] = 0xBB
+          ..[1] = 0xCC;
         final contactJson = [
           {
             'publicKey': base64Encode(Uint8List(32)..[0] = 0xAA),
@@ -517,7 +523,7 @@ void main() {
             'lastSeen': DateTime.now().millisecondsSinceEpoch,
             'lastMessageAt': DateTime.now().millisecondsSinceEpoch,
             'isActive': true,
-        }
+          },
         ];
 
         final prefs = PrefsManager.instance;
@@ -527,9 +533,12 @@ void main() {
         expect(contacts, hasLength(1));
         expect(contacts.first.pathLength, equals(1));
         expect(contacts.first.path, equals(Uint8List.fromList([0xBB, 0xCC])));
-    });
+      },
+    );
 
-    test('MessageStore decodes and migrates legacy mode-encoded message paths', () async {
+    test(
+      'MessageStore decodes and migrates legacy mode-encoded message paths',
+      () async {
         final store = MessageStore()..publicKeyHex = '1234567890';
         final contactKeyHex = pubKeyToHex(Uint8List(32)..[0] = 0xAA);
 
@@ -544,23 +553,31 @@ void main() {
             'messageId': 'msg_1',
             'pathLength': 64, // encoded pathLength (mode 1, 0 hops)
             'pathBytes': base64Encode(rawPath),
-        }
+          },
         ];
 
         final prefs = PrefsManager.instance;
-      await prefs.setString('${store.keyFor}$contactKeyHex', jsonEncode(messageJson));
+        await prefs.setString(
+          '${store.keyFor}$contactKeyHex',
+          jsonEncode(messageJson),
+        );
 
         final messages = await store.loadMessages(contactKeyHex);
         expect(messages, hasLength(1));
         expect(messages.first.pathLength, equals(0));
         expect(messages.first.pathBytes, isEmpty);
-    });
+      },
+    );
 
-    test('ChannelMessageStore decodes and migrates legacy mode-encoded paths', () async {
+    test(
+      'ChannelMessageStore decodes and migrates legacy mode-encoded paths',
+      () async {
         final store = ChannelMessageStore()..publicKeyHex = '1234567890';
         final channelIndex = 1;
 
-      final rawPath = Uint8List(64)..[0] = 0xBB..[1] = 0xCC; 
+        final rawPath = Uint8List(64)
+          ..[0] = 0xBB
+          ..[1] = 0xCC;
         final messageJson = [
           {
             'senderName': 'Alice',
@@ -571,23 +588,34 @@ void main() {
             'channelIndex': channelIndex,
             'pathLength': 65, // encoded pathLength (mode 1, 1 hop)
             'pathBytes': base64Encode(rawPath),
-        }
+          },
         ];
 
         final prefs = PrefsManager.instance;
-      await prefs.setString('${store.keyFor}$channelIndex', jsonEncode(messageJson));
+        await prefs.setString(
+          '${store.keyFor}$channelIndex',
+          jsonEncode(messageJson),
+        );
 
         final messages = await store.loadChannelMessages(channelIndex);
         expect(messages, hasLength(1));
         expect(messages.first.pathLength, equals(1));
-      expect(messages.first.pathBytes, equals(Uint8List.fromList([0xBB, 0xCC])));
+        expect(
+          messages.first.pathBytes,
+          equals(Uint8List.fromList([0xBB, 0xCC])),
+        );
         expect(messages.first.pathHashWidth, equals(2));
-    });
+      },
+    );
 
-    test('ContactDiscoveryStore decodes and migrates legacy mode-encoded paths', () async {
+    test(
+      'ContactDiscoveryStore decodes and migrates legacy mode-encoded paths',
+      () async {
         final store = ContactDiscoveryStore();
 
-      final rawPath = Uint8List(64)..[0] = 0x11..[1] = 0x22;
+        final rawPath = Uint8List(64)
+          ..[0] = 0x11
+          ..[1] = 0x22;
         final contactJson = [
           {
             'publicKey': base64Encode(Uint8List(32)..[0] = 0xBB),
@@ -598,7 +626,7 @@ void main() {
             'path': base64Encode(rawPath),
             'lastSeen': DateTime.now().millisecondsSinceEpoch,
             'lastMessageAt': DateTime.now().millisecondsSinceEpoch,
-        }
+          },
         ];
 
         final prefs = PrefsManager.instance;
@@ -608,6 +636,7 @@ void main() {
         expect(contacts, hasLength(1));
         expect(contacts.first.pathLength, equals(1));
         expect(contacts.first.path, equals(Uint8List.fromList([0x11, 0x22])));
-    });
+      },
+    );
   });
 }

test/screens/path_trace_test.dart

@@ -20,7 +20,8 @@ class _FakeMeshCoreConnector extends MeshCoreConnector {
   Stream<Uint8List> get receivedFrames => _receivedFramesController.stream;
 
   @override
-  Uint8List? get selfPublicKey => Uint8List.fromList(List.generate(32, (i) => i));
+  Uint8List? get selfPublicKey =>
+      Uint8List.fromList(List.generate(32, (i) => i));
 
   @override
   double? get selfLatitude => 48.8566;
@@ -60,9 +61,7 @@ Widget _buildTestApp({
       ChangeNotifierProvider<AppSettingsService>(
         create: (_) => AppSettingsService(),
       ),
-      Provider<MapTileCacheService>(
+      Provider<MapTileCacheService>(create: (_) => MapTileCacheService()),
-        create: (_) => MapTileCacheService(),
-      ),
     ],
     child: MaterialApp(
       localizationsDelegates: AppLocalizations.localizationsDelegates,
@@ -73,7 +72,9 @@ Widget _buildTestApp({
 }
 
 void main() {
-  testWidgets('PathTraceMapScreen parses response frames correctly', (tester) async {
+  testWidgets('PathTraceMapScreen parses response frames correctly', (
+    tester,
+  ) async {
     final connector = _FakeMeshCoreConnector();
 
     final screen = PathTraceMapScreen(
@@ -135,7 +136,9 @@ void main() {
     expect(find.text('Path trace not available.'), findsNothing);
   });
 
-  testWidgets('PathTraceMapScreen parses multi-byte encoded path trace response correctly', (tester) async {
+  testWidgets(
+    'PathTraceMapScreen parses multi-byte encoded path trace response correctly',
+    (tester) async {
       final connector = _FakeMeshCoreConnector();
 
       final screen = PathTraceMapScreen(
@@ -144,7 +147,9 @@ void main() {
         pathHashByteWidth: 2,
       );
 
-    await tester.pumpWidget(_buildTestApp(connector: connector, child: screen));
+      await tester.pumpWidget(
+        _buildTestApp(connector: connector, child: screen),
+      );
       await tester.pump();
 
       // Verify a send request was made
@@ -192,9 +197,12 @@ void main() {
 
       // Verify it parsed correctly (should not show the unavailable message)
       expect(find.text('Path trace not available.'), findsNothing);
-  });
+    },
+  );
 
-  testWidgets('PathTraceMapScreen buildPath: Direct repeater ping (0-hop)', (tester) async {
+  testWidgets('PathTraceMapScreen buildPath: Direct repeater ping (0-hop)', (
+    tester,
+  ) async {
     final connector = _FakeMeshCoreConnector();
     final target = Contact(
       publicKey: Uint8List.fromList([0xAA, 0xBB, 0xCC]),
@@ -223,7 +231,9 @@ void main() {
     expect(payload, Uint8List.fromList([0xAA]));
   });
 
-  testWidgets('PathTraceMapScreen buildPath: 1-hop chat contact trace', (tester) async {
+  testWidgets('PathTraceMapScreen buildPath: 1-hop chat contact trace', (
+    tester,
+  ) async {
     final connector = _FakeMeshCoreConnector();
     final target = Contact(
       publicKey: Uint8List.fromList([0xCC, 0xDD, 0xEE]),
@@ -252,7 +262,9 @@ void main() {
     expect(payload, Uint8List.fromList([0xBB, 0xCC, 0xBB]));
   });
 
-  testWidgets('PathTraceMapScreen buildPath: Multi-hop chat contact trace', (tester) async {
+  testWidgets('PathTraceMapScreen buildPath: Multi-hop chat contact trace', (
+    tester,
+  ) async {
     final connector = _FakeMeshCoreConnector();
     final target = Contact(
       publicKey: Uint8List.fromList([0x33, 0x44, 0x55]),
@@ -281,7 +293,9 @@ void main() {
     expect(payload, Uint8List.fromList([0x11, 0x22, 0x33, 0x22, 0x11]));
   });
 
-  testWidgets('PathTraceMapScreen buildPath: Map trace with null target contact', (tester) async {
+  testWidgets(
+    'PathTraceMapScreen buildPath: Map trace with null target contact',
+    (tester) async {
       final connector = _FakeMeshCoreConnector();
 
       final screen = PathTraceMapScreen(
@@ -292,7 +306,9 @@ void main() {
         pathHashByteWidth: 1,
       );
 
-    await tester.pumpWidget(_buildTestApp(connector: connector, child: screen));
+      await tester.pumpWidget(
+        _buildTestApp(connector: connector, child: screen),
+      );
       await tester.pump();
 
       expect(connector.sentFrames.length, 1);
@@ -300,9 +316,12 @@ void main() {
       expect(sentFrame[0], cmdSendTracePath);
       final payload = sentFrame.sublist(10);
       expect(payload, Uint8List.fromList([0x11, 0x22, 0x11]));
-  });
+    },
+  );
 
-  testWidgets('PathTraceMapScreen parses raw byte length fallback correctly', (tester) async {
+  testWidgets('PathTraceMapScreen parses raw byte length fallback correctly', (
+    tester,
+  ) async {
     final connector = _FakeMeshCoreConnector();
 
     final screen = PathTraceMapScreen(