From 80ead2fc2d63e910a82e09d6287741fd6039902f Mon Sep 17 00:00:00 2001 From: zjs81 Date: Sat, 7 Nov 2026 22:53:42 -0700 Subject: [PATCH] Address review: trace request size and contact-share translation - Manual path trace validates the request that will actually be sent (round trips become 2n-1 hops, 3-byte hops go out as 4-byte prefixes) against the 172-byte frame and 64-hop firmware limits, and disables Run with an explanation when it does not fit. PathTraceMapScreen also refuses to send an oversized request. - Contact-share tokens are never passed through message translation, so the share cannot be mangled before sending. --- lib/helpers/path_trace_input.dart | 25 +++++++++++++ lib/l10n/app_bg.arb | 1 + lib/l10n/app_cs.arb | 1 + lib/l10n/app_de.arb | 1 + lib/l10n/app_en.arb | 1 + lib/l10n/app_es.arb | 1 + lib/l10n/app_fr.arb | 1 + lib/l10n/app_hu.arb | 1 + lib/l10n/app_it.arb | 1 + lib/l10n/app_ja.arb | 1 + lib/l10n/app_ko.arb | 1 + lib/l10n/app_localizations.dart | 6 ++++ lib/l10n/app_localizations_bg.dart | 4 +++ lib/l10n/app_localizations_cs.dart | 4 +++ lib/l10n/app_localizations_de.dart | 4 +++ lib/l10n/app_localizations_en.dart | 4 +++ lib/l10n/app_localizations_es.dart | 4 +++ lib/l10n/app_localizations_fr.dart | 4 +++ lib/l10n/app_localizations_hu.dart | 4 +++ lib/l10n/app_localizations_it.dart | 4 +++ lib/l10n/app_localizations_ja.dart | 4 +++ lib/l10n/app_localizations_ko.dart | 4 +++ lib/l10n/app_localizations_nl.dart | 4 +++ lib/l10n/app_localizations_pl.dart | 4 +++ lib/l10n/app_localizations_pt.dart | 4 +++ lib/l10n/app_localizations_ru.dart | 4 +++ lib/l10n/app_localizations_sk.dart | 4 +++ lib/l10n/app_localizations_sl.dart | 4 +++ lib/l10n/app_localizations_sv.dart | 4 +++ lib/l10n/app_localizations_uk.dart | 4 +++ lib/l10n/app_localizations_zh.dart | 4 +++ lib/l10n/app_nl.arb | 1 + lib/l10n/app_pl.arb | 1 + lib/l10n/app_pt.arb | 1 + lib/l10n/app_ru.arb | 1 + lib/l10n/app_sk.arb | 1 + lib/l10n/app_sl.arb | 1 + lib/l10n/app_sv.arb | 1 + lib/l10n/app_uk.arb | 1 + lib/l10n/app_zh.arb | 1 + lib/screens/manual_path_trace_screen.dart | 8 +++-- lib/screens/path_trace_map.dart | 14 ++++++++ lib/services/translation_service.dart | 5 +++ test/helpers/path_trace_input_test.dart | 24 +++++++++++++ .../translation_eligibility_test.dart | 35 +++++++++++++++++++ 45 files changed, 210 insertions(+), 2 deletions(-) create mode 100644 test/services/translation_eligibility_test.dart diff --git a/lib/helpers/path_trace_input.dart b/lib/helpers/path_trace_input.dart index ddb6294a..7396d8ed 100644 --- a/lib/helpers/path_trace_input.dart +++ b/lib/helpers/path_trace_input.dart @@ -115,3 +115,28 @@ class PathTraceInputParser { static String _stripPrefix(String t) => (t.startsWith('0x') || t.startsWith('0X')) ? t.substring(2) : t; } + +/// `CMD_SEND_TRACE_PATH` header: command, tag x4, auth x4, flags. +const int traceRequestHeaderBytes = 10; + +/// Bytes per hop the trace request uses for [hopWidth]-byte hashes. Trace +/// flags encode the width as a power of two, so 3-byte hops are sent as +/// 4-byte public-key prefixes. +int traceHashWidthFor(int hopWidth) => hopWidth <= 1 + ? 1 + : hopWidth == 2 + ? 2 + : 4; + +/// Hops actually sent: a round trip goes out and back over the same hops, +/// sharing the far end (n hops become 2n - 1). +int tracedHopCount(int hops, {required bool roundTrip}) => + roundTrip && hops > 1 ? hops * 2 - 1 : hops; + +/// Whether [input] traced in this mode fits one request: the firmware takes +/// at most [maxPathSize] hops and the frame must stay within [maxFrameSize]. +bool traceFitsInRequest(PathTraceInput input, {required bool roundTrip}) { + final hops = tracedHopCount(input.hops.length, roundTrip: roundTrip); + final bytes = hops * traceHashWidthFor(input.hopWidth); + return hops <= maxPathSize && traceRequestHeaderBytes + bytes <= maxFrameSize; +} diff --git a/lib/l10n/app_bg.arb b/lib/l10n/app_bg.arb index 3f4cc05c..e52c88ee 100644 --- a/lib/l10n/app_bg.arb +++ b/lib/l10n/app_bg.arb @@ -3659,6 +3659,7 @@ "manualTrace_errorMixedWidths": "Всички хешове трябва да са с еднаква дължина", "manualTrace_errorUnsupportedWidth": "Хешовете трябва да са 1, 2 или 3 байта (2, 4 или 6 шестнадесетични знаци)", "manualTrace_errorTooManyHops": "Пътят е твърде дълъг (максимум {max} байта)", + "manualTrace_errorTraceTooLong": "Твърде много хопове за трасиране в една заявка. Премахнете няколко хопа или изберете „Както е въведено“.", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_cs.arb b/lib/l10n/app_cs.arb index 85abf42b..b78a9eee 100644 --- a/lib/l10n/app_cs.arb +++ b/lib/l10n/app_cs.arb @@ -4272,6 +4272,7 @@ "manualTrace_errorMixedWidths": "Všechny hashe musí mít stejnou délku", "manualTrace_errorUnsupportedWidth": "Hashe musí mít 1, 2 nebo 3 bajty (2, 4 nebo 6 hexadecimálních znaků)", "manualTrace_errorTooManyHops": "Cesta je příliš dlouhá (maximum {max} bajtů)", + "manualTrace_errorTraceTooLong": "Příliš mnoho skoků pro trasování v jednom požadavku. Odeberte některé skoky nebo zvolte „Dle zadání“.", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_de.arb b/lib/l10n/app_de.arb index d2222753..1e61aa6b 100644 --- a/lib/l10n/app_de.arb +++ b/lib/l10n/app_de.arb @@ -3794,6 +3794,7 @@ "manualTrace_errorMixedWidths": "Alle Hashes müssen die gleiche Länge haben", "manualTrace_errorUnsupportedWidth": "Hashes müssen 1, 2 oder 3 Bytes lang sein (2, 4 oder 6 Hex-Zeichen)", "manualTrace_errorTooManyHops": "Pfad ist zu lang (maximal {max} Bytes)", + "manualTrace_errorTraceTooLong": "Zu viele Hops für eine einzelne Verfolgung. Entfernen Sie einige Hops oder wählen Sie „Wie eingegeben“.", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index d9a3a709..c528ce51 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -1498,6 +1498,7 @@ "manualTrace_errorMixedWidths": "All hashes must be the same length", "manualTrace_errorUnsupportedWidth": "Hashes must be 1, 2 or 3 bytes (2, 4 or 6 hex characters)", "manualTrace_errorTooManyHops": "Path is too long (maximum {max} bytes)", + "manualTrace_errorTraceTooLong": "Too many hops to trace in one request. Remove some hops or choose As entered.", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_es.arb b/lib/l10n/app_es.arb index aa60f658..29c3d693 100644 --- a/lib/l10n/app_es.arb +++ b/lib/l10n/app_es.arb @@ -3845,6 +3845,7 @@ "manualTrace_errorMixedWidths": "Todos los hashes deben tener la misma longitud", "manualTrace_errorUnsupportedWidth": "Los hashes deben ser de 1, 2 o 3 bytes (2, 4 o 6 caracteres hexadecimales)", "manualTrace_errorTooManyHops": "La ruta es demasiado larga (máximo {max} bytes)", + "manualTrace_errorTraceTooLong": "Demasiados saltos para trazar en una sola solicitud. Quita algunos saltos o elige «Tal como se introdujo».", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_fr.arb b/lib/l10n/app_fr.arb index 123daa94..2b6a68ae 100644 --- a/lib/l10n/app_fr.arb +++ b/lib/l10n/app_fr.arb @@ -3793,6 +3793,7 @@ "manualTrace_errorMixedWidths": "Tous les hachages doivent avoir la même longueur", "manualTrace_errorUnsupportedWidth": "Les hachages doivent faire 1, 2 ou 3 octets (2, 4 ou 6 caractères hexadécimaux)", "manualTrace_errorTooManyHops": "Le chemin est trop long (maximum {max} octets)", + "manualTrace_errorTraceTooLong": "Trop de sauts à tracer en une seule requête. Retirez des sauts ou choisissez « Tel que saisi ».", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_hu.arb b/lib/l10n/app_hu.arb index 3d68f21a..a786058c 100644 --- a/lib/l10n/app_hu.arb +++ b/lib/l10n/app_hu.arb @@ -3750,6 +3750,7 @@ "manualTrace_errorMixedWidths": "Minden hashnek azonos hosszúságúnak kell lennie", "manualTrace_errorUnsupportedWidth": "A hasheknek 1, 2 vagy 3 bájtosnak kell lenniük (2, 4 vagy 6 hexadecimális karakter)", "manualTrace_errorTooManyHops": "Az útvonal túl hosszú (legfeljebb {max} bájt)", + "manualTrace_errorTraceTooLong": "Túl sok ugrás egyetlen nyomkövetési kéréshez. Távolíts el néhány ugrást, vagy válaszd a „Megadott sorrendben” lehetőséget.", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_it.arb b/lib/l10n/app_it.arb index 65e687af..9cfba865 100644 --- a/lib/l10n/app_it.arb +++ b/lib/l10n/app_it.arb @@ -3793,6 +3793,7 @@ "manualTrace_errorMixedWidths": "Tutti gli hash devono avere la stessa lunghezza", "manualTrace_errorUnsupportedWidth": "Gli hash devono essere di 1, 2 o 3 byte (2, 4 o 6 caratteri esadecimali)", "manualTrace_errorTooManyHops": "Il percorso è troppo lungo (massimo {max} byte)", + "manualTrace_errorTraceTooLong": "Troppi salti da tracciare in una sola richiesta. Rimuovi alcuni salti o scegli «Come inserito».", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb index 3beb5fd5..cf67e6a4 100644 --- a/lib/l10n/app_ja.arb +++ b/lib/l10n/app_ja.arb @@ -3999,6 +3999,7 @@ "manualTrace_errorMixedWidths": "すべてのハッシュは同じ長さにしてください", "manualTrace_errorUnsupportedWidth": "ハッシュは1、2、3バイト(16進数で2、4、6文字)にしてください", "manualTrace_errorTooManyHops": "経路が長すぎます(最大 {max} バイト)", + "manualTrace_errorTraceTooLong": "1回のリクエストでトレースできるホップ数を超えています。ホップを減らすか、「入力どおり」を選んでください。", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_ko.arb b/lib/l10n/app_ko.arb index ddbef26e..b3e4f8aa 100644 --- a/lib/l10n/app_ko.arb +++ b/lib/l10n/app_ko.arb @@ -3999,6 +3999,7 @@ "manualTrace_errorMixedWidths": "모든 해시의 길이가 같아야 합니다", "manualTrace_errorUnsupportedWidth": "해시는 1, 2 또는 3바이트(16진수 2, 4 또는 6자)여야 합니다", "manualTrace_errorTooManyHops": "경로가 너무 깁니다(최대 {max}바이트)", + "manualTrace_errorTraceTooLong": "한 번의 요청으로 추적하기에는 홉이 너무 많습니다. 홉을 줄이거나 “입력한 대로”를 선택하세요.", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart index 90ef04b6..a42e4484 100644 --- a/lib/l10n/app_localizations.dart +++ b/lib/l10n/app_localizations.dart @@ -5166,6 +5166,12 @@ abstract class AppLocalizations { /// **'Path is too long (maximum {max} bytes)'** String manualTrace_errorTooManyHops(int max); + /// No description provided for @manualTrace_errorTraceTooLong. + /// + /// In en, this message translates to: + /// **'Too many hops to trace in one request. Remove some hops or choose As entered.'** + String get manualTrace_errorTraceTooLong; + /// No description provided for @mapCache_title. /// /// In en, this message translates to: diff --git a/lib/l10n/app_localizations_bg.dart b/lib/l10n/app_localizations_bg.dart index 77e59b23..f5b8ae90 100644 --- a/lib/l10n/app_localizations_bg.dart +++ b/lib/l10n/app_localizations_bg.dart @@ -2924,6 +2924,10 @@ class AppLocalizationsBg extends AppLocalizations { return 'Пътят е твърде дълъг (максимум $max байта)'; } + @override + String get manualTrace_errorTraceTooLong => + 'Твърде много хопове за трасиране в една заявка. Премахнете няколко хопа или изберете „Както е въведено“.'; + @override String get mapCache_title => 'Кеш на офлайн карти'; diff --git a/lib/l10n/app_localizations_cs.dart b/lib/l10n/app_localizations_cs.dart index 55ceee6f..01e37b3a 100644 --- a/lib/l10n/app_localizations_cs.dart +++ b/lib/l10n/app_localizations_cs.dart @@ -2907,6 +2907,10 @@ class AppLocalizationsCs extends AppLocalizations { return 'Cesta je příliš dlouhá (maximum $max bajtů)'; } + @override + String get manualTrace_errorTraceTooLong => + 'Příliš mnoho skoků pro trasování v jednom požadavku. Odeberte některé skoky nebo zvolte „Dle zadání“.'; + @override String get mapCache_title => 'Offline mezipaměť map'; diff --git a/lib/l10n/app_localizations_de.dart b/lib/l10n/app_localizations_de.dart index 51eca652..c3f77622 100644 --- a/lib/l10n/app_localizations_de.dart +++ b/lib/l10n/app_localizations_de.dart @@ -2924,6 +2924,10 @@ class AppLocalizationsDe extends AppLocalizations { return 'Pfad ist zu lang (maximal $max Bytes)'; } + @override + String get manualTrace_errorTraceTooLong => + 'Zu viele Hops für eine einzelne Verfolgung. Entfernen Sie einige Hops oder wählen Sie „Wie eingegeben“.'; + @override String get mapCache_title => 'Offline-Karten-Cache'; diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart index 7be25e77..841a22ee 100644 --- a/lib/l10n/app_localizations_en.dart +++ b/lib/l10n/app_localizations_en.dart @@ -2879,6 +2879,10 @@ class AppLocalizationsEn extends AppLocalizations { return 'Path is too long (maximum $max bytes)'; } + @override + String get manualTrace_errorTraceTooLong => + 'Too many hops to trace in one request. Remove some hops or choose As entered.'; + @override String get mapCache_title => 'Offline Map Cache'; diff --git a/lib/l10n/app_localizations_es.dart b/lib/l10n/app_localizations_es.dart index 58b0c35c..64a0ddec 100644 --- a/lib/l10n/app_localizations_es.dart +++ b/lib/l10n/app_localizations_es.dart @@ -2913,6 +2913,10 @@ class AppLocalizationsEs extends AppLocalizations { return 'La ruta es demasiado larga (máximo $max bytes)'; } + @override + String get manualTrace_errorTraceTooLong => + 'Demasiados saltos para trazar en una sola solicitud. Quita algunos saltos o elige «Tal como se introdujo».'; + @override String get mapCache_title => 'Caché de mapa sin conexión'; diff --git a/lib/l10n/app_localizations_fr.dart b/lib/l10n/app_localizations_fr.dart index d679b5d1..e4016dc9 100644 --- a/lib/l10n/app_localizations_fr.dart +++ b/lib/l10n/app_localizations_fr.dart @@ -2923,6 +2923,10 @@ class AppLocalizationsFr extends AppLocalizations { return 'Le chemin est trop long (maximum $max octets)'; } + @override + String get manualTrace_errorTraceTooLong => + 'Trop de sauts à tracer en une seule requête. Retirez des sauts ou choisissez « Tel que saisi ».'; + @override String get mapCache_title => 'Cache de carte hors ligne'; diff --git a/lib/l10n/app_localizations_hu.dart b/lib/l10n/app_localizations_hu.dart index fdc8031e..9ee118d7 100644 --- a/lib/l10n/app_localizations_hu.dart +++ b/lib/l10n/app_localizations_hu.dart @@ -2913,6 +2913,10 @@ class AppLocalizationsHu extends AppLocalizations { return 'Az útvonal túl hosszú (legfeljebb $max bájt)'; } + @override + String get manualTrace_errorTraceTooLong => + 'Túl sok ugrás egyetlen nyomkövetési kéréshez. Távolíts el néhány ugrást, vagy válaszd a „Megadott sorrendben” lehetőséget.'; + @override String get mapCache_title => 'Offline térképgyorsítótár'; diff --git a/lib/l10n/app_localizations_it.dart b/lib/l10n/app_localizations_it.dart index b5f1eb43..5bac30cf 100644 --- a/lib/l10n/app_localizations_it.dart +++ b/lib/l10n/app_localizations_it.dart @@ -2921,6 +2921,10 @@ class AppLocalizationsIt extends AppLocalizations { return 'Il percorso è troppo lungo (massimo $max byte)'; } + @override + String get manualTrace_errorTraceTooLong => + 'Troppi salti da tracciare in una sola richiesta. Rimuovi alcuni salti o scegli «Come inserito».'; + @override String get mapCache_title => 'Cache mappa offline'; diff --git a/lib/l10n/app_localizations_ja.dart b/lib/l10n/app_localizations_ja.dart index 2e2c40d3..8017eeb1 100644 --- a/lib/l10n/app_localizations_ja.dart +++ b/lib/l10n/app_localizations_ja.dart @@ -2793,6 +2793,10 @@ class AppLocalizationsJa extends AppLocalizations { return '経路が長すぎます(最大 $max バイト)'; } + @override + String get manualTrace_errorTraceTooLong => + '1回のリクエストでトレースできるホップ数を超えています。ホップを減らすか、「入力どおり」を選んでください。'; + @override String get mapCache_title => 'オフライン用地図キャッシュ'; diff --git a/lib/l10n/app_localizations_ko.dart b/lib/l10n/app_localizations_ko.dart index d617ec2a..4cf017ce 100644 --- a/lib/l10n/app_localizations_ko.dart +++ b/lib/l10n/app_localizations_ko.dart @@ -2796,6 +2796,10 @@ class AppLocalizationsKo extends AppLocalizations { return '경로가 너무 깁니다(최대 $max바이트)'; } + @override + String get manualTrace_errorTraceTooLong => + '한 번의 요청으로 추적하기에는 홉이 너무 많습니다. 홉을 줄이거나 “입력한 대로”를 선택하세요.'; + @override String get mapCache_title => '오프라인 지도 캐시'; diff --git a/lib/l10n/app_localizations_nl.dart b/lib/l10n/app_localizations_nl.dart index fae1300f..89830e91 100644 --- a/lib/l10n/app_localizations_nl.dart +++ b/lib/l10n/app_localizations_nl.dart @@ -2904,6 +2904,10 @@ class AppLocalizationsNl extends AppLocalizations { return 'Pad is te lang (maximaal $max bytes)'; } + @override + String get manualTrace_errorTraceTooLong => + 'Te veel hops om in één verzoek te tracen. Verwijder enkele hops of kies „Zoals ingevoerd”.'; + @override String get mapCache_title => 'Offline Kaarten Cache'; diff --git a/lib/l10n/app_localizations_pl.dart b/lib/l10n/app_localizations_pl.dart index 5cd02d3d..39e18cad 100644 --- a/lib/l10n/app_localizations_pl.dart +++ b/lib/l10n/app_localizations_pl.dart @@ -2939,6 +2939,10 @@ class AppLocalizationsPl extends AppLocalizations { return 'Ścieżka jest zbyt długa (maksymalnie $max bajtów)'; } + @override + String get manualTrace_errorTraceTooLong => + 'Zbyt wiele skoków do prześledzenia w jednym żądaniu. Usuń część skoków lub wybierz „Jak wprowadzono”.'; + @override String get mapCache_title => 'Pamięć podręczna map offline'; diff --git a/lib/l10n/app_localizations_pt.dart b/lib/l10n/app_localizations_pt.dart index b83af220..8a4a1746 100644 --- a/lib/l10n/app_localizations_pt.dart +++ b/lib/l10n/app_localizations_pt.dart @@ -2915,6 +2915,10 @@ class AppLocalizationsPt extends AppLocalizations { return 'O caminho é muito longo (máximo de $max bytes)'; } + @override + String get manualTrace_errorTraceTooLong => + 'Saltos demais para rastrear em uma única solicitação. Remova alguns saltos ou escolha “Como inserido”.'; + @override String get mapCache_title => 'Cache de Mapa Offline'; diff --git a/lib/l10n/app_localizations_ru.dart b/lib/l10n/app_localizations_ru.dart index a92cb670..ec63c701 100644 --- a/lib/l10n/app_localizations_ru.dart +++ b/lib/l10n/app_localizations_ru.dart @@ -2922,6 +2922,10 @@ class AppLocalizationsRu extends AppLocalizations { return 'Путь слишком длинный (максимум $max байт)'; } + @override + String get manualTrace_errorTraceTooLong => + 'Слишком много хопов для трассировки за один запрос. Удалите часть хопов или выберите «Как введено».'; + @override String get mapCache_title => 'Кэш офлайн-карты'; diff --git a/lib/l10n/app_localizations_sk.dart b/lib/l10n/app_localizations_sk.dart index ec255e51..fbf65869 100644 --- a/lib/l10n/app_localizations_sk.dart +++ b/lib/l10n/app_localizations_sk.dart @@ -2914,6 +2914,10 @@ class AppLocalizationsSk extends AppLocalizations { return 'Cesta je príliš dlhá (maximum $max bajtov)'; } + @override + String get manualTrace_errorTraceTooLong => + 'Príliš veľa skokov na sledovanie v jednej požiadavke. Odstráňte niektoré skoky alebo zvoľte „Podľa zadania“.'; + @override String get mapCache_title => 'Offline Mapa Pamäť'; diff --git a/lib/l10n/app_localizations_sl.dart b/lib/l10n/app_localizations_sl.dart index 5a06a318..b476c0d1 100644 --- a/lib/l10n/app_localizations_sl.dart +++ b/lib/l10n/app_localizations_sl.dart @@ -2905,6 +2905,10 @@ class AppLocalizationsSl extends AppLocalizations { return 'Pot je predolga (največ $max bajtov)'; } + @override + String get manualTrace_errorTraceTooLong => + 'Preveč skokov za sledenje v eni zahtevi. Odstranite nekaj skokov ali izberite »Kot vneseno«.'; + @override String get mapCache_title => 'Omrezni predpomnilnik zemljeških zemljejevskih slik'; diff --git a/lib/l10n/app_localizations_sv.dart b/lib/l10n/app_localizations_sv.dart index 124cf0a6..c60a0786 100644 --- a/lib/l10n/app_localizations_sv.dart +++ b/lib/l10n/app_localizations_sv.dart @@ -2889,6 +2889,10 @@ class AppLocalizationsSv extends AppLocalizations { return 'Rutten är för lång (högst $max byte)'; } + @override + String get manualTrace_errorTraceTooLong => + 'För många hopp för att spåra i en enda förfrågan. Ta bort några hopp eller välj ”Som inmatat”.'; + @override String get mapCache_title => 'Offline Kartcache'; diff --git a/lib/l10n/app_localizations_uk.dart b/lib/l10n/app_localizations_uk.dart index 7885da16..493ef29f 100644 --- a/lib/l10n/app_localizations_uk.dart +++ b/lib/l10n/app_localizations_uk.dart @@ -2915,6 +2915,10 @@ class AppLocalizationsUk extends AppLocalizations { return 'Шлях задовгий (максимум $max байт)'; } + @override + String get manualTrace_errorTraceTooLong => + 'Забагато хопів для трасування в одному запиті. Видаліть кілька хопів або виберіть «Як введено».'; + @override String get mapCache_title => 'Офлайн-кеш карти'; diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart index 44dcb3e8..29d7811a 100644 --- a/lib/l10n/app_localizations_zh.dart +++ b/lib/l10n/app_localizations_zh.dart @@ -2753,6 +2753,10 @@ class AppLocalizationsZh extends AppLocalizations { return '路径过长(最多 $max 字节)'; } + @override + String get manualTrace_errorTraceTooLong => + '跳数过多,无法在一次请求中追踪。请减少一些跳,或选择“按输入顺序”。'; + @override String get mapCache_title => '离线地图缓存'; diff --git a/lib/l10n/app_nl.arb b/lib/l10n/app_nl.arb index f0346cc8..fa0f4f26 100644 --- a/lib/l10n/app_nl.arb +++ b/lib/l10n/app_nl.arb @@ -3560,6 +3560,7 @@ "manualTrace_errorMixedWidths": "Alle hashes moeten even lang zijn", "manualTrace_errorUnsupportedWidth": "Hashes moeten 1, 2 of 3 bytes zijn (2, 4 of 6 hex-tekens)", "manualTrace_errorTooManyHops": "Pad is te lang (maximaal {max} bytes)", + "manualTrace_errorTraceTooLong": "Te veel hops om in één verzoek te tracen. Verwijder enkele hops of kies „Zoals ingevoerd”.", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_pl.arb b/lib/l10n/app_pl.arb index 110458b0..3828b5c7 100644 --- a/lib/l10n/app_pl.arb +++ b/lib/l10n/app_pl.arb @@ -3898,6 +3898,7 @@ "manualTrace_errorMixedWidths": "Wszystkie hasze muszą mieć tę samą długość", "manualTrace_errorUnsupportedWidth": "Hasze muszą mieć 1, 2 lub 3 bajty (2, 4 lub 6 znaków szesnastkowych)", "manualTrace_errorTooManyHops": "Ścieżka jest zbyt długa (maksymalnie {max} bajtów)", + "manualTrace_errorTraceTooLong": "Zbyt wiele skoków do prześledzenia w jednym żądaniu. Usuń część skoków lub wybierz „Jak wprowadzono”.", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_pt.arb b/lib/l10n/app_pt.arb index 08329228..f55670df 100644 --- a/lib/l10n/app_pt.arb +++ b/lib/l10n/app_pt.arb @@ -3711,6 +3711,7 @@ "manualTrace_errorMixedWidths": "Todos os hashes devem ter o mesmo comprimento", "manualTrace_errorUnsupportedWidth": "Os hashes devem ter 1, 2 ou 3 bytes (2, 4 ou 6 caracteres hexadecimais)", "manualTrace_errorTooManyHops": "O caminho é muito longo (máximo de {max} bytes)", + "manualTrace_errorTraceTooLong": "Saltos demais para rastrear em uma única solicitação. Remova alguns saltos ou escolha “Como inserido”.", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_ru.arb b/lib/l10n/app_ru.arb index dd578bd9..d385a651 100644 --- a/lib/l10n/app_ru.arb +++ b/lib/l10n/app_ru.arb @@ -2956,6 +2956,7 @@ "manualTrace_errorMixedWidths": "Все хэши должны быть одной длины", "manualTrace_errorUnsupportedWidth": "Хэши должны быть длиной 1, 2 или 3 байта (2, 4 или 6 шестнадцатеричных символов)", "manualTrace_errorTooManyHops": "Путь слишком длинный (максимум {max} байт)", + "manualTrace_errorTraceTooLong": "Слишком много хопов для трассировки за один запрос. Удалите часть хопов или выберите «Как введено».", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_sk.arb b/lib/l10n/app_sk.arb index 949b1553..d9b36e3f 100644 --- a/lib/l10n/app_sk.arb +++ b/lib/l10n/app_sk.arb @@ -3712,6 +3712,7 @@ "manualTrace_errorMixedWidths": "Všetky hashe musia mať rovnakú dĺžku", "manualTrace_errorUnsupportedWidth": "Hashe musia mať 1, 2 alebo 3 bajty (2, 4 alebo 6 hexadecimálnych znakov)", "manualTrace_errorTooManyHops": "Cesta je príliš dlhá (maximum {max} bajtov)", + "manualTrace_errorTraceTooLong": "Príliš veľa skokov na sledovanie v jednej požiadavke. Odstráňte niektoré skoky alebo zvoľte „Podľa zadania“.", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_sl.arb b/lib/l10n/app_sl.arb index 9ad7834f..7e261529 100644 --- a/lib/l10n/app_sl.arb +++ b/lib/l10n/app_sl.arb @@ -3866,6 +3866,7 @@ "manualTrace_errorMixedWidths": "Vse zgoščene vrednosti morajo biti enake dolžine", "manualTrace_errorUnsupportedWidth": "Zgoščene vrednosti morajo imeti 1, 2 ali 3 bajte (2, 4 ali 6 šestnajstiških znakov)", "manualTrace_errorTooManyHops": "Pot je predolga (največ {max} bajtov)", + "manualTrace_errorTraceTooLong": "Preveč skokov za sledenje v eni zahtevi. Odstranite nekaj skokov ali izberite »Kot vneseno«.", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_sv.arb b/lib/l10n/app_sv.arb index c78a77b9..7c8eb94d 100644 --- a/lib/l10n/app_sv.arb +++ b/lib/l10n/app_sv.arb @@ -3706,6 +3706,7 @@ "manualTrace_errorMixedWidths": "Alla hashar måste ha samma längd", "manualTrace_errorUnsupportedWidth": "Hashar måste vara 1, 2 eller 3 byte (2, 4 eller 6 hex-tecken)", "manualTrace_errorTooManyHops": "Rutten är för lång (högst {max} byte)", + "manualTrace_errorTraceTooLong": "För många hopp för att spåra i en enda förfrågan. Ta bort några hopp eller välj ”Som inmatat”.", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_uk.arb b/lib/l10n/app_uk.arb index 533be109..0f62f71b 100644 --- a/lib/l10n/app_uk.arb +++ b/lib/l10n/app_uk.arb @@ -3639,6 +3639,7 @@ "manualTrace_errorMixedWidths": "Усі хеші мають бути однакової довжини", "manualTrace_errorUnsupportedWidth": "Хеші мають бути завдовжки 1, 2 або 3 байти (2, 4 або 6 шістнадцяткових символів)", "manualTrace_errorTooManyHops": "Шлях задовгий (максимум {max} байт)", + "manualTrace_errorTraceTooLong": "Забагато хопів для трасування в одному запиті. Видаліть кілька хопів або виберіть «Як введено».", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb index 5ff34337..3b4aa865 100644 --- a/lib/l10n/app_zh.arb +++ b/lib/l10n/app_zh.arb @@ -3716,6 +3716,7 @@ "manualTrace_errorMixedWidths": "所有哈希长度必须相同", "manualTrace_errorUnsupportedWidth": "哈希必须为 1、2 或 3 字节(2、4 或 6 个十六进制字符)", "manualTrace_errorTooManyHops": "路径过长(最多 {max} 字节)", + "manualTrace_errorTraceTooLong": "跳数过多,无法在一次请求中追踪。请减少一些跳,或选择“按输入顺序”。", "@manualTrace_errorTooManyHops": { "placeholders": { "max": { diff --git a/lib/screens/manual_path_trace_screen.dart b/lib/screens/manual_path_trace_screen.dart index 9360c70a..f3d7ebae 100644 --- a/lib/screens/manual_path_trace_screen.dart +++ b/lib/screens/manual_path_trace_screen.dart @@ -137,9 +137,13 @@ class _ManualPathTraceScreenState extends State { connector.pathHashByteWidth, ); final input = result.input; - final errorText = result.error == null ? null : _errorText(result.error!); + final fits = + input == null || traceFitsInRequest(input, roundTrip: _returnPath); + final errorText = result.error != null + ? _errorText(result.error!) + : (fits ? null : l10n.manualTrace_errorTraceTooLong); final exampleWidth = input?.hopWidth ?? connector.pathHashByteWidth; - final canRun = input != null && connector.isConnected; + final canRun = input != null && fits && connector.isConnected; const buttonSize = Size(48, 48); return Scaffold( diff --git a/lib/screens/path_trace_map.dart b/lib/screens/path_trace_map.dart index bdf78612..15db8f63 100644 --- a/lib/screens/path_trace_map.dart +++ b/lib/screens/path_trace_map.dart @@ -444,6 +444,20 @@ class _PathTraceMapScreenState extends State flags, // flag payload: tracePayload, ); + if (frame.length > maxFrameSize) { + // Too many hops for one request (round trips double them); the radio + // would reject or truncate it. + appLogger.warn( + 'Path trace request too large: ${frame.length} bytes', + tag: 'PathTraceMapScreen', + ); + if (!mounted) return; + setState(() { + _isLoading = false; + _failed2Loaded = true; + }); + return; + } _awaitingTraceSent = true; _timeoutTimer?.cancel(); // Fallback in case RESP_CODE_SENT / RESP_CODE_ERR never arrives; the diff --git a/lib/services/translation_service.dart b/lib/services/translation_service.dart index 0be08c4e..43de41d7 100644 --- a/lib/services/translation_service.dart +++ b/lib/services/translation_service.dart @@ -7,6 +7,7 @@ import 'package:flutter_langdetect/flutter_langdetect.dart'; import '../models/app_settings.dart'; import '../models/translation_support.dart'; +import '../helpers/contact_share_message.dart'; import '../helpers/gif_helper.dart'; import '../utils/app_logger.dart'; import 'app_settings_service.dart'; @@ -573,6 +574,10 @@ class TranslationService extends ChangeNotifier { if (GifHelper.parseGif(trimmed) != null) { return false; } + // A shared contact card is data: translating it would mangle the token. + if (parseContactShare(trimmed) != null) { + return false; + } return !(trimmed.startsWith('m:') || trimmed.startsWith('V1|') || trimmed.startsWith('r:')); diff --git a/test/helpers/path_trace_input_test.dart b/test/helpers/path_trace_input_test.dart index 75e758b3..fff5ce2a 100644 --- a/test/helpers/path_trace_input_test.dart +++ b/test/helpers/path_trace_input_test.dart @@ -47,4 +47,28 @@ void main() { final wide = List.filled(22, 'aabbcc').join(','); expect(p(wide).error, PathTraceInputError.tooManyHops); }); + + group('traceFitsInRequest', () { + PathTraceInput hops(int count, int width) => PathTraceInputParser.parse( + List.generate(count, (i) => 'ab' * width).join(','), + width, + ).input!; + + test('round trip of 21 three-byte hops exceeds the frame limit', () { + // 41 hops x 4-byte trace prefixes + 10-byte header = 174 > 172. + expect(traceFitsInRequest(hops(21, 3), roundTrip: true), isFalse); + expect(traceFitsInRequest(hops(21, 3), roundTrip: false), isTrue); + }); + + test('round trip of 20 three-byte hops fits', () { + // 39 x 4 + 10 = 166. + expect(traceFitsInRequest(hops(20, 3), roundTrip: true), isTrue); + }); + + test('hop count is capped at 64 even when bytes fit', () { + // 33 one-byte hops round trip = 65 hops. + expect(traceFitsInRequest(hops(33, 1), roundTrip: true), isFalse); + expect(traceFitsInRequest(hops(32, 1), roundTrip: true), isTrue); + }); + }); } diff --git a/test/services/translation_eligibility_test.dart b/test/services/translation_eligibility_test.dart new file mode 100644 index 00000000..5ed54bf1 --- /dev/null +++ b/test/services/translation_eligibility_test.dart @@ -0,0 +1,35 @@ +import 'package:flutter_test/flutter_test.dart'; +import 'package:meshcore_open/services/app_settings_service.dart'; +import 'package:meshcore_open/services/translation_service.dart'; +import 'package:meshcore_open/storage/prefs_manager.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +void main() { + TestWidgetsFlutterBinding.ensureInitialized(); + + test('outgoing translation skips contact-share tokens', () async { + SharedPreferences.setMockInitialValues({}); + await PrefsManager.initialize(); + final settings = AppSettingsService(); + await settings.loadSettings(); + await settings.setComposerTranslationEnabled(true); + final translation = TranslationService(settings); + const token = + '<50ba28f599799142622d188469a63f3890d495cdcedd24239052abd364c0283d:1:CC>'; + + expect( + translation.shouldTranslateOutgoing( + text: token, + targetLanguageCode: 'de', + ), + isFalse, + ); + expect( + translation.shouldTranslateOutgoing( + text: 'hello there', + targetLanguageCode: 'de', + ), + isTrue, + ); + }); +}