From 38aaf84c00a726aaec4543678c0a03eacbe654c5 Mon Sep 17 00:00:00 2001 From: Luis Guzman Date: Wed, 18 Nov 2026 12:29:19 -0600 Subject: [PATCH 1/2] K2GO-583 fix(maps): an overlapping region says so, not "No internet connection" The size check now tells a 409 overlap answer from a failed request. An overlap shows its own message with OK; Retry stays for real network failures. --- .../k2go/redesign/FqrController.java | 20 +++++++++-- .../k2go/redesign/MapsRegionClient.java | 16 +++++---- .../app/src/main/res/values-ar/strings.xml | 1 + .../app/src/main/res/values-az/strings.xml | 1 + .../app/src/main/res/values-bg/strings.xml | 1 + .../app/src/main/res/values-bn/strings.xml | 1 + .../app/src/main/res/values-cs/strings.xml | 1 + .../app/src/main/res/values-de/strings.xml | 1 + .../app/src/main/res/values-el/strings.xml | 1 + .../app/src/main/res/values-es/strings.xml | 1 + .../app/src/main/res/values-fa/strings.xml | 1 + .../app/src/main/res/values-fr/strings.xml | 1 + .../app/src/main/res/values-gu/strings.xml | 1 + .../app/src/main/res/values-hi/strings.xml | 1 + .../app/src/main/res/values-hu/strings.xml | 1 + .../app/src/main/res/values-in/strings.xml | 1 + .../app/src/main/res/values-it/strings.xml | 1 + .../app/src/main/res/values-ja/strings.xml | 1 + .../app/src/main/res/values-ko/strings.xml | 1 + .../app/src/main/res/values-lt/strings.xml | 1 + .../app/src/main/res/values-nl/strings.xml | 1 + .../app/src/main/res/values-no/strings.xml | 1 + .../app/src/main/res/values-pl/strings.xml | 1 + .../app/src/main/res/values-pt/strings.xml | 1 + .../app/src/main/res/values-ro/strings.xml | 1 + .../src/main/res/values-ru-rRU/strings.xml | 1 + .../app/src/main/res/values-sk/strings.xml | 1 + .../app/src/main/res/values-sr/strings.xml | 1 + .../app/src/main/res/values-sw/strings.xml | 1 + .../app/src/main/res/values-ta/strings.xml | 1 + .../app/src/main/res/values-tr/strings.xml | 1 + .../app/src/main/res/values-uk/strings.xml | 1 + .../app/src/main/res/values-vi/strings.xml | 1 + .../app/src/main/res/values-yo/strings.xml | 1 + .../src/main/res/values-zh-rCN/strings.xml | 1 + .../app/src/main/res/values/strings.xml | 1 + .../k2go/redesign/MapsRegionClientTest.java | 33 +++++++++++++++++++ 37 files changed, 94 insertions(+), 9 deletions(-) create mode 100644 controller/app/src/test/java/org/appdevforall/k2go/redesign/MapsRegionClientTest.java diff --git a/controller/app/src/main/java/org/appdevforall/k2go/redesign/FqrController.java b/controller/app/src/main/java/org/appdevforall/k2go/redesign/FqrController.java index 5fce5543d..bac166c2d 100644 --- a/controller/app/src/main/java/org/appdevforall/k2go/redesign/FqrController.java +++ b/controller/app/src/main/java/org/appdevforall/k2go/redesign/FqrController.java @@ -288,6 +288,11 @@ private void runEstimate(String name, String box) { dismissDialog(); showConsent(name, box, transfer, archive, free, freeAfter); } + @Override public void onOverlap() { + if (estimateCanceled) return; + dismissDialog(); + overlapEstimateError(); + } @Override public void onError(String message) { if (estimateCanceled) return; dismissDialog(); @@ -1166,10 +1171,21 @@ private void errorDialog(int titleRes, CharSequence message) { .show(); } + /** K2GO-583: the region overlaps a downloaded one. Retry cannot help, so only OK, which clears the + * selection so the user can draw another region. */ + private void overlapEstimateError() { + new BrandDialog(themed) + .setTitle(R.string.k2go_fqr_estimate_error_title) + .setMessage(str(R.string.k2go_fqr_overlap)) + .setPositive(android.R.string.ok, () -> resetMapSelection()) + .setOnCancel(() -> resetMapSelection()) + .show(); + } + /** K2GO-317 follow-up: an estimate failed (usually offline). Keep the drawn region and offer Retry * (re-run the estimate for the same name + box), so the user does not redraw; "Not now" gives up and - * clears the selection, like the consent dialog's bail-outs. The body is a LOCALIZED string (the data - * layer's friendlyError is raw English); reuses install_msg_no_connection, translated in every locale. */ + * clears the selection, like the consent dialog's bail-outs. Reuses install_msg_no_connection, + * translated in every locale. */ private void retryableEstimateError(String name, String box) { new BrandDialog(themed) .setTitle(R.string.k2go_fqr_estimate_error_title) diff --git a/controller/app/src/main/java/org/appdevforall/k2go/redesign/MapsRegionClient.java b/controller/app/src/main/java/org/appdevforall/k2go/redesign/MapsRegionClient.java index 15e618ecd..362b061fb 100644 --- a/controller/app/src/main/java/org/appdevforall/k2go/redesign/MapsRegionClient.java +++ b/controller/app/src/main/java/org/appdevforall/k2go/redesign/MapsRegionClient.java @@ -43,6 +43,8 @@ public final class MapsRegionClient { /** Size estimate (bytes) for the consent step. */ public interface EstimateListener { void onEstimate(long transfer, long archive, long free, long freeAfter); + /** K2GO-583: the region overlaps a downloaded region; a retry cannot help. */ + void onOverlap(); void onError(String message); } @@ -78,8 +80,9 @@ public void estimate(@NonNull String box, @NonNull EstimateListener l) { f = resp.optLong("free", 0), fa = resp.optLong("free_after", 0); main.post(() -> l.onEstimate(t, a, f, fa)); } catch (Exception e) { - final String m = friendlyError(e.getMessage()); - main.post(() -> l.onError(m)); + final String m = e.getMessage(); + if (isOverlap(m)) main.post(l::onOverlap); + else main.post(() -> l.onError(m)); } }); } @@ -245,11 +248,10 @@ private void deliver(Consumer c) { }); } - /** Map a raw HTTP error to something a first-run user can act on (overlap is the common one). */ - private static String friendlyError(String raw) { - if (raw == null) return "size estimate failed"; - if (raw.contains("409") || raw.toLowerCase().contains("overlap")) return "This region overlaps one you already have."; - return "size estimate failed"; + /** K2GO-583: the estimate failed because the box overlaps a downloaded region. The box answers + * 409 "overlaps an existing region" (static/dashboard/routes.ts /maps/estimate). */ + static boolean isOverlap(String raw) { + return raw != null && (raw.startsWith("HTTP 409") || raw.toLowerCase(java.util.Locale.ROOT).contains("overlap")); } private static JSONObject httpJson(String method, String urlStr, JSONObject body) throws Exception { diff --git a/controller/app/src/main/res/values-ar/strings.xml b/controller/app/src/main/res/values-ar/strings.xml index 9873ccc20..0746f61a8 100644 --- a/controller/app/src/main/res/values-ar/strings.xml +++ b/controller/app/src/main/res/values-ar/strings.xml @@ -1040,6 +1040,7 @@ «%1$s» مستخدم بالفعل. اختر اسمًا مختلفًا. جارٍ حساب حجم التنزيل… لا يمكن تنزيل هذه المنطقة + هذه المنطقة تتداخل مع منطقة نزّلتها بالفعل. تنزيل هذه المنطقة؟ “%1$s” — %2$s للتنزيل، %3$s على القرص. هذه المنطقة: %1$s · المتاح بعدها: %2$s diff --git a/controller/app/src/main/res/values-az/strings.xml b/controller/app/src/main/res/values-az/strings.xml index 6fa4eb47d..abd201497 100644 --- a/controller/app/src/main/res/values-az/strings.xml +++ b/controller/app/src/main/res/values-az/strings.xml @@ -1060,6 +1060,7 @@ “%1$s” artıq istifadə olunur. Başqa ad seç. Yükləmə ölçüsü hesablanır… Bu region yüklənə bilmir + Bu bölgə artıq endirdiyiniz bir bölgə ilə üst-üstə düşür. Bu region yüklənsin? “%1$s” — yükləmək üçün %2$s, diskdə %3$s. Bu region: %1$s · Sonra boş: %2$s diff --git a/controller/app/src/main/res/values-bg/strings.xml b/controller/app/src/main/res/values-bg/strings.xml index 49232ccdc..63cb94ab0 100644 --- a/controller/app/src/main/res/values-bg/strings.xml +++ b/controller/app/src/main/res/values-bg/strings.xml @@ -1047,6 +1047,7 @@ „%1$s“ вече се използва. Изберете друго име. Изчисляване на размера за изтегляне… Този регион не може да се изтегли + Този регион се припокрива с регион, който вече сте изтеглили. Изтегляне на този регион? “%1$s” — %2$s за изтегляне, %3$s на диска. Този регион: %1$s · Свободно след: %2$s diff --git a/controller/app/src/main/res/values-bn/strings.xml b/controller/app/src/main/res/values-bn/strings.xml index ee5712282..47ed4994d 100644 --- a/controller/app/src/main/res/values-bn/strings.xml +++ b/controller/app/src/main/res/values-bn/strings.xml @@ -1053,6 +1053,7 @@ “%1$s” ইতিমধ্যে ব্যবহৃত। একটি ভিন্ন নাম বেছে নিন। ডাউনলোডের আকার গণনা করা হচ্ছে… এই অঞ্চল ডাউনলোড করা যাচ্ছে না + এই অঞ্চলটি আপনার আগে ডাউনলোড করা একটি অঞ্চলের সাথে ওভারল্যাপ করে। এই অঞ্চল ডাউনলোড করবেন? “%1$s” — ডাউনলোড করতে %2$s, ডিস্কে %3$s। এই অঞ্চল: %1$s · পরে খালি: %2$s diff --git a/controller/app/src/main/res/values-cs/strings.xml b/controller/app/src/main/res/values-cs/strings.xml index 45b0d6e1f..6400c9e10 100644 --- a/controller/app/src/main/res/values-cs/strings.xml +++ b/controller/app/src/main/res/values-cs/strings.xml @@ -1047,6 +1047,7 @@ „%1$s“ se už používá. Vyber jiný název. Výpočet velikosti stahování… Tuto oblast nelze stáhnout + Tato oblast se překrývá s oblastí, kterou jste už stáhli. Stáhnout tuto oblast? “%1$s” — %2$s ke stažení, %3$s na disku. Tato oblast: %1$s · Volné poté: %2$s diff --git a/controller/app/src/main/res/values-de/strings.xml b/controller/app/src/main/res/values-de/strings.xml index b5a2b58b1..7ca8f509c 100644 --- a/controller/app/src/main/res/values-de/strings.xml +++ b/controller/app/src/main/res/values-de/strings.xml @@ -1040,6 +1040,7 @@ „%1$s“ wird bereits verwendet. Wähle einen anderen Namen. Download-Größe wird berechnet… Diese Region kann nicht heruntergeladen werden + Diese Region überschneidet sich mit einer Region, die Sie bereits heruntergeladen haben. Diese Region herunterladen? “%1$s” — %2$s zum Herunterladen, %3$s auf dem Speicher. Diese Region: %1$s · Frei danach: %2$s diff --git a/controller/app/src/main/res/values-el/strings.xml b/controller/app/src/main/res/values-el/strings.xml index 23bedff00..e7a89e951 100644 --- a/controller/app/src/main/res/values-el/strings.xml +++ b/controller/app/src/main/res/values-el/strings.xml @@ -1047,6 +1047,7 @@ Το «%1$s» χρησιμοποιείται ήδη. Διάλεξε άλλο όνομα. Υπολογισμός μεγέθους λήψης… Δεν είναι δυνατή η λήψη αυτής της περιοχής + Αυτή η περιοχή επικαλύπτεται με μια περιοχή που έχετε ήδη κατεβάσει. Λήψη αυτής της περιοχής; “%1$s” — %2$s για λήψη, %3$s στον δίσκο. Αυτή η περιοχή: %1$s · Ελεύθερα μετά: %2$s diff --git a/controller/app/src/main/res/values-es/strings.xml b/controller/app/src/main/res/values-es/strings.xml index 4bf879f71..6cb189fec 100644 --- a/controller/app/src/main/res/values-es/strings.xml +++ b/controller/app/src/main/res/values-es/strings.xml @@ -1116,6 +1116,7 @@ “%1$s” ya está en uso. Elige un nombre diferente. Calculando el tamaño de descarga… No se puede descargar esta región + Esta región se superpone con una región que ya descargaste. ¿Descargar esta región? “%1$s” — %2$s para descargar, %3$s en disco. Esta región: %1$s · Libre después: %2$s diff --git a/controller/app/src/main/res/values-fa/strings.xml b/controller/app/src/main/res/values-fa/strings.xml index 704361fb4..8a5ba4baa 100644 --- a/controller/app/src/main/res/values-fa/strings.xml +++ b/controller/app/src/main/res/values-fa/strings.xml @@ -1040,6 +1040,7 @@ «%1$s» از قبل استفاده شده است. نام دیگری انتخاب کنید. در حال محاسبه حجم دانلود… دانلود این منطقه ممکن نیست + این منطقه با منطقه‌ای که قبلاً دانلود کرده‌اید هم‌پوشانی دارد. این منطقه دانلود شود؟ “%1$s” — %2$s برای دانلود، %3$s روی دیسک. این منطقه: %1$s · آزاد پس از آن: %2$s diff --git a/controller/app/src/main/res/values-fr/strings.xml b/controller/app/src/main/res/values-fr/strings.xml index 58570e335..0531bf8a0 100644 --- a/controller/app/src/main/res/values-fr/strings.xml +++ b/controller/app/src/main/res/values-fr/strings.xml @@ -1126,6 +1126,7 @@ « %1$s » est déjà utilisé. Choisissez un autre nom. Calcul de la taille du téléchargement… Impossible de télécharger cette région + Cette région chevauche une région que vous avez déjà téléchargée. Télécharger cette région ? « %1$s » — %2$s à télécharger, %3$s sur le disque. Cette région : %1$s · Libre après : %2$s diff --git a/controller/app/src/main/res/values-gu/strings.xml b/controller/app/src/main/res/values-gu/strings.xml index aad775733..1b2c6738b 100644 --- a/controller/app/src/main/res/values-gu/strings.xml +++ b/controller/app/src/main/res/values-gu/strings.xml @@ -1053,6 +1053,7 @@ “%1$s” પહેલેથી વપરાયેલું છે. અલગ નામ પસંદ કરો. ડાઉનલોડ કદની ગણતરી થઈ રહી છે… આ પ્રદેશ ડાઉનલોડ કરી શકાતો નથી + આ પ્રદેશ તમે પહેલેથી ડાઉનલોડ કરેલા પ્રદેશ સાથે ઓવરલેપ થાય છે. આ પ્રદેશ ડાઉનલોડ કરવો છે? “%1$s” — ડાઉનલોડ કરવા %2$s, ડિસ્ક પર %3$s. આ પ્રદેશ: %1$s · પછી ખાલી: %2$s diff --git a/controller/app/src/main/res/values-hi/strings.xml b/controller/app/src/main/res/values-hi/strings.xml index b43552c4d..fda345308 100644 --- a/controller/app/src/main/res/values-hi/strings.xml +++ b/controller/app/src/main/res/values-hi/strings.xml @@ -1117,6 +1117,7 @@ “%1$s” पहले से उपयोग में है। कोई अलग नाम चुनें। डाउनलोड आकार की गणना हो रही है… यह क्षेत्र डाउनलोड नहीं कर सकते + यह क्षेत्र उस क्षेत्र से ओवरलैप करता है जिसे आप पहले ही डाउनलोड कर चुके हैं। यह क्षेत्र डाउनलोड करें? “%1$s” — डाउनलोड के लिए %2$s, डिस्क पर %3$s। यह क्षेत्र: %1$s · बाद में खाली: %2$s diff --git a/controller/app/src/main/res/values-hu/strings.xml b/controller/app/src/main/res/values-hu/strings.xml index 45c155c18..8e46f849b 100644 --- a/controller/app/src/main/res/values-hu/strings.xml +++ b/controller/app/src/main/res/values-hu/strings.xml @@ -1040,6 +1040,7 @@ A(z) „%1$s” már használatban van. Válassz másik nevet. Letöltési méret kiszámítása… Ez a régió nem tölthető le + Ez a régió átfedésben van egy már letöltött régióval. Letöltöd ezt a régiót? “%1$s” — %2$s a letöltés, %3$s a lemezen. Ez a régió: %1$s · Utána szabad: %2$s diff --git a/controller/app/src/main/res/values-in/strings.xml b/controller/app/src/main/res/values-in/strings.xml index aa02d19d0..399c3139d 100644 --- a/controller/app/src/main/res/values-in/strings.xml +++ b/controller/app/src/main/res/values-in/strings.xml @@ -1047,6 +1047,7 @@ “%1$s” sudah dipakai. Pilih nama lain. Menghitung ukuran unduhan… Tidak bisa mengunduh wilayah ini + Wilayah ini tumpang tindih dengan wilayah yang sudah Anda unduh. Unduh wilayah ini? “%1$s” — %2$s untuk diunduh, %3$s di disk. Wilayah ini: %1$s · Kosong setelahnya: %2$s diff --git a/controller/app/src/main/res/values-it/strings.xml b/controller/app/src/main/res/values-it/strings.xml index e2eea7557..c3326dde9 100644 --- a/controller/app/src/main/res/values-it/strings.xml +++ b/controller/app/src/main/res/values-it/strings.xml @@ -1040,6 +1040,7 @@ “%1$s” è già in uso. Scegli un nome diverso. Calcolo della dimensione del download… Impossibile scaricare questa regione + Questa regione si sovrappone a una regione che hai già scaricato. Scaricare questa regione? “%1$s” — %2$s da scaricare, %3$s su disco. Questa regione: %1$s · Libero dopo: %2$s diff --git a/controller/app/src/main/res/values-ja/strings.xml b/controller/app/src/main/res/values-ja/strings.xml index 01eb43baf..7e8ac66cb 100644 --- a/controller/app/src/main/res/values-ja/strings.xml +++ b/controller/app/src/main/res/values-ja/strings.xml @@ -1041,6 +1041,7 @@ 「%1$s」はすでに使われています。別の名前を選んでください。 ダウンロードサイズを計算中… この地域をダウンロードできません + この地域は、すでにダウンロードした地域と重なっています。 この地域をダウンロードしますか? 「%1$s」 — ダウンロード %2$s、ディスク上 %3$s。 この地域:%1$s · 完了後の空き:%2$s diff --git a/controller/app/src/main/res/values-ko/strings.xml b/controller/app/src/main/res/values-ko/strings.xml index a176f210b..45a175a57 100644 --- a/controller/app/src/main/res/values-ko/strings.xml +++ b/controller/app/src/main/res/values-ko/strings.xml @@ -1041,6 +1041,7 @@ “%1$s”은(는) 이미 사용 중입니다. 다른 이름을 선택하세요. 다운로드 크기를 계산하는 중… 이 지역을 다운로드할 수 없음 + 이 지역은 이미 다운로드한 지역과 겹칩니다. 이 지역을 다운로드하시겠어요? “%1$s” — 다운로드 %2$s, 디스크 %3$s. 이 지역: %1$s · 이후 여유: %2$s diff --git a/controller/app/src/main/res/values-lt/strings.xml b/controller/app/src/main/res/values-lt/strings.xml index ac0aad145..4ad3832ee 100644 --- a/controller/app/src/main/res/values-lt/strings.xml +++ b/controller/app/src/main/res/values-lt/strings.xml @@ -1056,6 +1056,7 @@ „%1$s“ jau naudojamas. Pasirinkite kitą pavadinimą. Skaičiuojamas atsisiuntimo dydis… Šio regiono atsisiųsti negalima + Šis regionas persidengia su jau atsisiųstu regionu. Atsisiųsti šį regioną? “%1$s” — %2$s atsisiųsti, %3$s diske. Šis regionas: %1$s · Po to laisva: %2$s diff --git a/controller/app/src/main/res/values-nl/strings.xml b/controller/app/src/main/res/values-nl/strings.xml index ee0127e49..d9635025f 100644 --- a/controller/app/src/main/res/values-nl/strings.xml +++ b/controller/app/src/main/res/values-nl/strings.xml @@ -1040,6 +1040,7 @@ “%1$s” is al in gebruik. Kies een andere naam. Downloadgrootte berekenen… Kan deze regio niet downloaden + Deze regio overlapt met een regio die je al hebt gedownload. Deze regio downloaden? “%1$s” — %2$s om te downloaden, %3$s op schijf. Deze regio: %1$s · Vrij daarna: %2$s diff --git a/controller/app/src/main/res/values-no/strings.xml b/controller/app/src/main/res/values-no/strings.xml index 04b4e3ce5..2d3b01b20 100644 --- a/controller/app/src/main/res/values-no/strings.xml +++ b/controller/app/src/main/res/values-no/strings.xml @@ -1049,6 +1049,7 @@ «%1$s» er allerede i bruk. Velg et annet navn. Beregner nedlastingsstørrelse… Kan ikke laste ned denne regionen + Denne regionen overlapper med en region du allerede har lastet ned. Laste ned denne regionen? “%1$s” — %2$s å laste ned, %3$s på disk. Denne regionen: %1$s · Ledig etterpå: %2$s diff --git a/controller/app/src/main/res/values-pl/strings.xml b/controller/app/src/main/res/values-pl/strings.xml index 9ac2be88b..97b60a303 100644 --- a/controller/app/src/main/res/values-pl/strings.xml +++ b/controller/app/src/main/res/values-pl/strings.xml @@ -1049,6 +1049,7 @@ „%1$s” jest już używana. Wybierz inną nazwę. Obliczanie rozmiaru pobierania… Nie można pobrać tego regionu + Ten region nakłada się na region, który już pobrano. Pobrać ten region? “%1$s” — %2$s do pobrania, %3$s na dysku. Ten region: %1$s · Wolne po: %2$s diff --git a/controller/app/src/main/res/values-pt/strings.xml b/controller/app/src/main/res/values-pt/strings.xml index f599ee29b..0f49894ed 100644 --- a/controller/app/src/main/res/values-pt/strings.xml +++ b/controller/app/src/main/res/values-pt/strings.xml @@ -1119,6 +1119,7 @@ “%1$s” já está em uso. Escolhe um nome diferente. A calcular o tamanho da transferência… Não é possível transferir esta região + Esta região se sobrepõe a uma região que você já baixou. Transferir esta região? “%1$s” — %2$s para transferir, %3$s no disco. Esta região: %1$s · Livre depois: %2$s diff --git a/controller/app/src/main/res/values-ro/strings.xml b/controller/app/src/main/res/values-ro/strings.xml index 474366a08..980f9e81b 100644 --- a/controller/app/src/main/res/values-ro/strings.xml +++ b/controller/app/src/main/res/values-ro/strings.xml @@ -1040,6 +1040,7 @@ „%1$s” este deja folosit. Alege alt nume. Se calculează dimensiunea descărcării… Nu se poate descărca această regiune + Această regiune se suprapune cu o regiune pe care ai descărcat-o deja. Descarci această regiune? “%1$s” — %2$s de descărcat, %3$s pe disc. Această regiune: %1$s · Liber după: %2$s diff --git a/controller/app/src/main/res/values-ru-rRU/strings.xml b/controller/app/src/main/res/values-ru-rRU/strings.xml index 586255b4b..c6c6784ac 100644 --- a/controller/app/src/main/res/values-ru-rRU/strings.xml +++ b/controller/app/src/main/res/values-ru-rRU/strings.xml @@ -1116,6 +1116,7 @@ «%1$s» уже используется. Выберите другое имя. Подсчёт размера загрузки… Не удаётся загрузить этот регион + Этот регион пересекается с уже загруженным регионом. Загрузить этот регион? “%1$s” — %2$s для загрузки, %3$s на диске. Этот регион: %1$s · Свободно после: %2$s diff --git a/controller/app/src/main/res/values-sk/strings.xml b/controller/app/src/main/res/values-sk/strings.xml index 33e96e7e5..9a219d95d 100644 --- a/controller/app/src/main/res/values-sk/strings.xml +++ b/controller/app/src/main/res/values-sk/strings.xml @@ -1047,6 +1047,7 @@ „%1$s“ sa už používa. Vyber iný názov. Vypočítava sa veľkosť sťahovania… Túto oblasť nemožno stiahnuť + Táto oblasť sa prekrýva s oblasťou, ktorú ste už stiahli. Stiahnuť túto oblasť? “%1$s” — %2$s na stiahnutie, %3$s na disku. Táto oblasť: %1$s · Voľné potom: %2$s diff --git a/controller/app/src/main/res/values-sr/strings.xml b/controller/app/src/main/res/values-sr/strings.xml index eea8e9d51..5a35807ea 100644 --- a/controller/app/src/main/res/values-sr/strings.xml +++ b/controller/app/src/main/res/values-sr/strings.xml @@ -1053,6 +1053,7 @@ „%1$s“ се већ користи. Изабери друго име. Израчунавање величине преузимања… Није могуће преузети овај регион + Овај регион се преклапа са регионом који сте већ преузели. Преузети овај регион? “%1$s” — %2$s за преузимање, %3$s на диску. Овај регион: %1$s · Слободно након: %2$s diff --git a/controller/app/src/main/res/values-sw/strings.xml b/controller/app/src/main/res/values-sw/strings.xml index 5c6257960..3cb4133e5 100644 --- a/controller/app/src/main/res/values-sw/strings.xml +++ b/controller/app/src/main/res/values-sw/strings.xml @@ -1060,6 +1060,7 @@ “%1$s” tayari inatumika. Chagua jina tofauti. Inakokotoa ukubwa wa upakuaji… Haiwezi kupakua eneo hili + Eneo hili linaingiliana na eneo ambalo tayari umepakua. Pakua eneo hili? “%1$s” — %2$s kupakua, %3$s kwenye diski. Eneo hili: %1$s · Wazi baadaye: %2$s diff --git a/controller/app/src/main/res/values-ta/strings.xml b/controller/app/src/main/res/values-ta/strings.xml index dbc97496d..c0e488b97 100644 --- a/controller/app/src/main/res/values-ta/strings.xml +++ b/controller/app/src/main/res/values-ta/strings.xml @@ -1060,6 +1060,7 @@ “%1$s” ஏற்கனவே பயன்பாட்டில் உள்ளது. வேறு பெயரைத் தேர்ந்தெடுக்கவும். பதிவிறக்க அளவு கணக்கிடப்படுகிறது… இந்தப் பகுதியைப் பதிவிறக்க முடியாது + இந்தப் பகுதி நீங்கள் ஏற்கனவே பதிவிறக்கிய பகுதியுடன் மேற்பொருந்துகிறது. இந்தப் பகுதியைப் பதிவிறக்கவா? “%1$s” — பதிவிறக்க %2$s, வட்டில் %3$s. இந்தப் பகுதி: %1$s · பிறகு காலி: %2$s diff --git a/controller/app/src/main/res/values-tr/strings.xml b/controller/app/src/main/res/values-tr/strings.xml index f88f3a4dc..d80f457e8 100644 --- a/controller/app/src/main/res/values-tr/strings.xml +++ b/controller/app/src/main/res/values-tr/strings.xml @@ -1040,6 +1040,7 @@ “%1$s” zaten kullanımda. Farklı bir ad seç. İndirme boyutu hesaplanıyor… Bu bölge indirilemiyor + Bu bölge, daha önce indirdiğiniz bir bölgeyle çakışıyor. Bu bölge indirilsin mi? “%1$s” — indirmek için %2$s, diskte %3$s. Bu bölge: %1$s · Sonrasında boş: %2$s diff --git a/controller/app/src/main/res/values-uk/strings.xml b/controller/app/src/main/res/values-uk/strings.xml index 0b0b312a3..c67f3c3f4 100644 --- a/controller/app/src/main/res/values-uk/strings.xml +++ b/controller/app/src/main/res/values-uk/strings.xml @@ -1040,6 +1040,7 @@ «%1$s» уже використовується. Виберіть іншу назву. Обчислення розміру завантаження… Не вдається завантажити цей регіон + Цей регіон перетинається з регіоном, який ви вже завантажили. Завантажити цей регіон? “%1$s” — %2$s для завантаження, %3$s на диску. Цей регіон: %1$s · Вільно після: %2$s diff --git a/controller/app/src/main/res/values-vi/strings.xml b/controller/app/src/main/res/values-vi/strings.xml index c0ea23274..76a1803eb 100644 --- a/controller/app/src/main/res/values-vi/strings.xml +++ b/controller/app/src/main/res/values-vi/strings.xml @@ -1040,6 +1040,7 @@ “%1$s” đã được dùng. Hãy chọn tên khác. Đang tính kích thước tải… Không thể tải khu vực này + Vùng này chồng lấn với một vùng bạn đã tải xuống. Tải khu vực này? “%1$s” — %2$s để tải, %3$s trên đĩa. Khu vực này: %1$s · Trống sau: %2$s diff --git a/controller/app/src/main/res/values-yo/strings.xml b/controller/app/src/main/res/values-yo/strings.xml index 8d6919ebc..823f0e694 100644 --- a/controller/app/src/main/res/values-yo/strings.xml +++ b/controller/app/src/main/res/values-yo/strings.xml @@ -1060,6 +1060,7 @@ “%1$s” ti wà ní lílò tẹ́lẹ̀. Yan orúkọ mìíràn. Ń ṣírò ìwọ̀n gbígbà sílẹ̀… Kò lè gba agbègbè yìí sílẹ̀ + Agbègbè yìí bá agbègbè kan tí o ti gbà sílẹ̀ tẹ́lẹ̀ pàdé. Gba agbègbè yìí sílẹ̀? “%1$s” — %2$s láti gbà sílẹ̀, %3$s lórí diskì. Agbègbè yìí: %1$s · Òfìfo lẹ́yìn: %2$s diff --git a/controller/app/src/main/res/values-zh-rCN/strings.xml b/controller/app/src/main/res/values-zh-rCN/strings.xml index 38015c4f3..ff0ddf872 100644 --- a/controller/app/src/main/res/values-zh-rCN/strings.xml +++ b/controller/app/src/main/res/values-zh-rCN/strings.xml @@ -1041,6 +1041,7 @@ “%1$s”已被使用。请选择其他名称。 正在计算下载大小… 无法下载此区域 + 此区域与你已下载的区域重叠。 下载此区域? “%1$s” — 下载 %2$s,磁盘占用 %3$s。 此区域:%1$s · 之后可用:%2$s diff --git a/controller/app/src/main/res/values/strings.xml b/controller/app/src/main/res/values/strings.xml index f09b6cf2d..a6159a60b 100644 --- a/controller/app/src/main/res/values/strings.xml +++ b/controller/app/src/main/res/values/strings.xml @@ -1287,6 +1287,7 @@ “%1$s” is already used. Pick a different name. Calculating download size… Can\'t download this region + This region overlaps a region you already downloaded. Download this region? “%1$s” — %2$s to download, %3$s on disk. This region: %1$s · Free after: %2$s diff --git a/controller/app/src/test/java/org/appdevforall/k2go/redesign/MapsRegionClientTest.java b/controller/app/src/test/java/org/appdevforall/k2go/redesign/MapsRegionClientTest.java new file mode 100644 index 000000000..77a287377 --- /dev/null +++ b/controller/app/src/test/java/org/appdevforall/k2go/redesign/MapsRegionClientTest.java @@ -0,0 +1,33 @@ +/* + * ============================================================================ + * Name : MapsRegionClientTest.java + * Author : AppDevForAll + * Copyright : Copyright (c) 2026 AppDevForAll + * Description : K2GO-583. An overlap answer from the box is told apart from a network failure. + * ============================================================================ + */ +package org.appdevforall.k2go.redesign; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class MapsRegionClientTest { + + @Test + public void boxOverlapAnswerIsAnOverlap() { + assertTrue(MapsRegionClient.isOverlap("HTTP 409: {\"error\":\"overlaps an existing region\"}")); + assertTrue(MapsRegionClient.isOverlap("HTTP 409: ")); + assertTrue(MapsRegionClient.isOverlap("error: you cannot download OVERLAPPING full quality regions")); + } + + @Test + public void networkAndOtherFailuresAreNotAnOverlap() { + assertFalse(MapsRegionClient.isOverlap(null)); + assertFalse(MapsRegionClient.isOverlap("failed to connect to /127.0.0.1 (port 8085)")); + assertFalse(MapsRegionClient.isOverlap("HTTP 504: {\"error\":\"estimate timed out\"}")); + assertFalse(MapsRegionClient.isOverlap("HTTP 500: {\"error\":\"Error: spawn sudo ENOENT\"}")); + assertFalse(MapsRegionClient.isOverlap("timeout after 4090 ms")); + } +} From f76bc0386ccf3e7f09588674ab56227bd8a417e2 Mon Sep 17 00:00:00 2001 From: Luis Guzman Date: Wed, 18 Nov 2026 12:56:20 -0600 Subject: [PATCH 2/2] K2GO-583 refactor(maps): overlap uses the shared error dialog; detect it by text only A 409 from the box can also mean a busy lock, so only the overlap text selects the overlap message. --- .../appdevforall/k2go/redesign/FqrController.java | 15 +++------------ .../k2go/redesign/MapsRegionClient.java | 7 ++++--- .../k2go/redesign/MapsRegionClientTest.java | 3 ++- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/controller/app/src/main/java/org/appdevforall/k2go/redesign/FqrController.java b/controller/app/src/main/java/org/appdevforall/k2go/redesign/FqrController.java index bac166c2d..963cd5bf9 100644 --- a/controller/app/src/main/java/org/appdevforall/k2go/redesign/FqrController.java +++ b/controller/app/src/main/java/org/appdevforall/k2go/redesign/FqrController.java @@ -291,7 +291,9 @@ private void runEstimate(String name, String box) { @Override public void onOverlap() { if (estimateCanceled) return; dismissDialog(); - overlapEstimateError(); + // K2GO-583: Retry cannot help, so clear the drawn region and show the reason with OK only. + resetMapSelection(); + errorDialog(R.string.k2go_fqr_estimate_error_title, str(R.string.k2go_fqr_overlap)); } @Override public void onError(String message) { if (estimateCanceled) return; @@ -1171,17 +1173,6 @@ private void errorDialog(int titleRes, CharSequence message) { .show(); } - /** K2GO-583: the region overlaps a downloaded one. Retry cannot help, so only OK, which clears the - * selection so the user can draw another region. */ - private void overlapEstimateError() { - new BrandDialog(themed) - .setTitle(R.string.k2go_fqr_estimate_error_title) - .setMessage(str(R.string.k2go_fqr_overlap)) - .setPositive(android.R.string.ok, () -> resetMapSelection()) - .setOnCancel(() -> resetMapSelection()) - .show(); - } - /** K2GO-317 follow-up: an estimate failed (usually offline). Keep the drawn region and offer Retry * (re-run the estimate for the same name + box), so the user does not redraw; "Not now" gives up and * clears the selection, like the consent dialog's bail-outs. Reuses install_msg_no_connection, diff --git a/controller/app/src/main/java/org/appdevforall/k2go/redesign/MapsRegionClient.java b/controller/app/src/main/java/org/appdevforall/k2go/redesign/MapsRegionClient.java index 362b061fb..fc9e768eb 100644 --- a/controller/app/src/main/java/org/appdevforall/k2go/redesign/MapsRegionClient.java +++ b/controller/app/src/main/java/org/appdevforall/k2go/redesign/MapsRegionClient.java @@ -248,10 +248,11 @@ private void deliver(Consumer c) { }); } - /** K2GO-583: the estimate failed because the box overlaps a downloaded region. The box answers - * 409 "overlaps an existing region" (static/dashboard/routes.ts /maps/estimate). */ + /** K2GO-583: the estimate failed because the box overlaps a downloaded region. Read the text, not the + * status: the box answers "overlaps an existing region" (static/dashboard/routes.ts /maps/estimate), + * and other routes use 409 for a busy lock. */ static boolean isOverlap(String raw) { - return raw != null && (raw.startsWith("HTTP 409") || raw.toLowerCase(java.util.Locale.ROOT).contains("overlap")); + return raw != null && raw.toLowerCase(java.util.Locale.ROOT).contains("overlap"); } private static JSONObject httpJson(String method, String urlStr, JSONObject body) throws Exception { diff --git a/controller/app/src/test/java/org/appdevforall/k2go/redesign/MapsRegionClientTest.java b/controller/app/src/test/java/org/appdevforall/k2go/redesign/MapsRegionClientTest.java index 77a287377..c98510af7 100644 --- a/controller/app/src/test/java/org/appdevforall/k2go/redesign/MapsRegionClientTest.java +++ b/controller/app/src/test/java/org/appdevforall/k2go/redesign/MapsRegionClientTest.java @@ -18,7 +18,6 @@ public class MapsRegionClientTest { @Test public void boxOverlapAnswerIsAnOverlap() { assertTrue(MapsRegionClient.isOverlap("HTTP 409: {\"error\":\"overlaps an existing region\"}")); - assertTrue(MapsRegionClient.isOverlap("HTTP 409: ")); assertTrue(MapsRegionClient.isOverlap("error: you cannot download OVERLAPPING full quality regions")); } @@ -29,5 +28,7 @@ public void networkAndOtherFailuresAreNotAnOverlap() { assertFalse(MapsRegionClient.isOverlap("HTTP 504: {\"error\":\"estimate timed out\"}")); assertFalse(MapsRegionClient.isOverlap("HTTP 500: {\"error\":\"Error: spawn sudo ENOENT\"}")); assertFalse(MapsRegionClient.isOverlap("timeout after 4090 ms")); + // A 409 that is not an overlap (a busy lock) must keep the Retry path. + assertFalse(MapsRegionClient.isOverlap("HTTP 409: {\"error\":\"another map region download or delete is running\",\"busy\":true}")); } }