From f0d7ef082d4fe6c1f291f61145a0bc96d04a09cc Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Thu, 22 Feb 2024 21:25:36 +0100 Subject: [PATCH] KMZ importer allows arbitrary file names for kml (was doc.kml). Fixes #1864. --- .../opentracks/io/file/importer/KmzTrackImporter.java | 5 +++-- src/main/res/values-b+es+419/strings.xml | 2 +- src/main/res/values-bg/strings.xml | 2 +- src/main/res/values-cs/strings.xml | 2 +- src/main/res/values-da/strings.xml | 2 +- src/main/res/values-de/strings.xml | 2 +- src/main/res/values-es/strings.xml | 2 +- src/main/res/values-et/strings.xml | 2 +- src/main/res/values-eu/strings.xml | 2 +- src/main/res/values-fi/strings.xml | 2 +- src/main/res/values-ga/strings.xml | 2 +- src/main/res/values-gl/strings.xml | 2 +- src/main/res/values-hr/strings.xml | 2 +- src/main/res/values-hu/strings.xml | 2 +- src/main/res/values-it/strings.xml | 2 +- src/main/res/values-kn/strings.xml | 2 +- src/main/res/values-lt/strings.xml | 2 +- src/main/res/values-nb/strings.xml | 2 +- src/main/res/values-nl/strings.xml | 2 +- src/main/res/values-pl/strings.xml | 2 +- src/main/res/values-pt-rBR/strings.xml | 2 +- src/main/res/values-pt-rPT/strings.xml | 2 +- src/main/res/values-pt/strings.xml | 2 +- src/main/res/values-ro/strings.xml | 2 +- src/main/res/values-ru/strings.xml | 2 +- src/main/res/values-sk/strings.xml | 2 +- src/main/res/values-sv/strings.xml | 2 +- src/main/res/values-tr/strings.xml | 2 +- src/main/res/values-uk/strings.xml | 2 +- src/main/res/values-vi/strings.xml | 2 +- src/main/res/values-zh-rTW/strings.xml | 2 +- src/main/res/values-zh/strings.xml | 2 +- src/main/res/values/strings.xml | 2 +- 33 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java index 51be5def1..00eff7b9e 100644 --- a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java +++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmzTrackImporter.java @@ -37,7 +37,6 @@ import de.dennisguse.opentracks.R; import de.dennisguse.opentracks.data.ContentProviderUtils; import de.dennisguse.opentracks.data.models.Marker; import de.dennisguse.opentracks.data.models.Track; -import de.dennisguse.opentracks.io.file.exporter.KmzTrackExporter; import de.dennisguse.opentracks.util.FileUtils; /** @@ -49,6 +48,8 @@ public class KmzTrackImporter { private static final String TAG = KmzTrackImporter.class.getSimpleName(); + private static final String KML_FILE_EXTENSION = ".kml"; + private static final List KMZ_IMAGES_EXT = List.of("jpeg", "jpg", "png"); private final Context context; @@ -156,7 +157,7 @@ public class KmzTrackImporter { } String fileName = zipEntry.getName(); - if (KmzTrackExporter.KMZ_KML_FILE.equals(fileName)) { + if (fileName.endsWith(KML_FILE_EXTENSION)) { List trackId = parseKml(zipInputStream); if (trackId.isEmpty()) { Log.d(TAG, "Unable to parse kml in kmz"); diff --git a/src/main/res/values-b+es+419/strings.xml b/src/main/res/values-b+es+419/strings.xml index 5b8d29215..f90e83ec1 100644 --- a/src/main/res/values-b+es+419/strings.xml +++ b/src/main/res/values-b+es+419/strings.xml @@ -316,7 +316,7 @@ Completado con %1$d errores Hilo interrumpido - No se ha encontrado ningún archivo doc.kml en KMZ + No se ha encontrado ningún archivo kml en KMZ Potencia promedio No se pudieron buscar dispositivos Bluetooth (error %1$i). Evitar reimportar los recorridos diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml index da203b6fe..60dec1b0f 100644 --- a/src/main/res/values-bg/strings.xml +++ b/src/main/res/values-bg/strings.xml @@ -333,7 +333,7 @@ limitations under the License. Точност на локацията: %1$s Име на версията: %1$s По време на запис присъства в режим на цял екран. - В KMZ не е открит файл doc.kml + В KMZ не е открит файл kml Какво можете да направите: \n а) проверете дали GPS е активиран, \n б) да подобрите приемането на GPS (например да излезете на открито), diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml index 1d83c1608..246020f8a 100644 --- a/src/main/res/values-cs/strings.xml +++ b/src/main/res/values-cs/strings.xml @@ -379,7 +379,7 @@ limitations under the License. Ukončeno GPS vypnuto GPS zaměřeno a připraveno - Soubor doc.kml nenalezen v KMZ + Soubor kml nenalezen v KMZ Formát souboru pro export/sdílení Na celou obrazovku Při nahrávání využívat celou obrazovku. diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml index 07ff54c49..3cb751426 100644 --- a/src/main/res/values-da/strings.xml +++ b/src/main/res/values-da/strings.xml @@ -390,7 +390,7 @@ limitations under the License. Filer ikke eksporteret GPS deaktiveret GPS fastsat og klar - Ingen doc.kml-fil fundet i KMZ + Ingen kml-fil fundet i KMZ Gns. kadence Maks. kadence Gns. Puls diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 1c9a205cb..635921ebf 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -471,7 +471,7 @@ Meldet das GPS-Gerät ungenaue Daten (z.B. Standort, Geschwindigkeit, Höhe), ka Anzeige im Vollbildmodus während der Aufzeichnung. Durchschnittlicher Herzfrequenz Verhindere den erneuten Import von Strecken(aufzeichnungen) - Keine doc.kml Datei im KMZ gefunden + Keine kml Datei im KMZ gefunden Thread unterbrochen Importieren der Datei gescheitert: %1$s Trittfrequenz diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml index e27c391a1..4f2a0de03 100644 --- a/src/main/res/values-es/strings.xml +++ b/src/main/res/values-es/strings.xml @@ -466,7 +466,7 @@ limitations under the License. Errores Abrir recorrido Ya existe - No se ha encontrado ningún archivo doc.kml en KMZ + No se ha encontrado ningún archivo kml en KMZ Ha configurado evitar la reimportación del recorrido Distancia: %1$s Velocidad: %1$s diff --git a/src/main/res/values-et/strings.xml b/src/main/res/values-et/strings.xml index bb0cb2df8..ecb2c954b 100644 --- a/src/main/res/values-et/strings.xml +++ b/src/main/res/values-et/strings.xml @@ -421,7 +421,7 @@ limitations under the License. Tühistamiseks vajutage uuesti tagasi GPS keelatud Toetamata failivorming - doc.kml faili ei leitud KMZ-st + kml faili ei leitud KMZ-st %1$s: %2$s Faile pole imporditud Fail %1$s imporditud diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml index 66a555724..6c9e6b5a1 100644 --- a/src/main/res/values-eu/strings.xml +++ b/src/main/res/values-eu/strings.xml @@ -427,7 +427,7 @@ GPS gailuak datu okerrak salatzen baditu (adibidez, kokapena, abiadura, kota), O Akatsak Analizatzailea errorea: %1$s Ezin izan da inportazio fitxategia: %1$s - Ez doc.kml fitxategia aurkitu KMZ + Ez kml fitxategia aurkitu KMZ %1$s: %2$s Dagoeneko existitzen da Ezarri duzu saihesteko re-import track diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml index 94d5293dd..9c9e9f282 100644 --- a/src/main/res/values-fi/strings.xml +++ b/src/main/res/values-fi/strings.xml @@ -386,7 +386,7 @@ limitations under the License. Instant post-workout vienti Pidä lopettaa GPS kiinteä ja valmis - Ei doc.KML tiedosto löytyy KMZ + Ei kml tiedosto löytyy KMZ Seuraa vientihakemistoa Vie reitti tiedostoon tallennuksen loputtua Pyörän ympärysmitta (mm) diff --git a/src/main/res/values-ga/strings.xml b/src/main/res/values-ga/strings.xml index 0c5423e6f..495dfc18f 100644 --- a/src/main/res/values-ga/strings.xml +++ b/src/main/res/values-ga/strings.xml @@ -156,7 +156,7 @@ Formáid comhaid nach dtacaítear léi Earráid pharsálaí: %1$s Ní féidir an comhad a iompórtáil: %1$s - Níor aimsíodh aon chomhad doc.kml i KMZ + Níor aimsíodh aon chomhad kml i KMZ %1$s: %2$s Atá ann cheana Earráidí diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml index bb742e52d..1bf387fe6 100644 --- a/src/main/res/values-gl/strings.xml +++ b/src/main/res/values-gl/strings.xml @@ -416,7 +416,7 @@ Se o GPS informa sobre datos pouco precisos (ex.: localización, velocidade, ele Rematou a exportación da ruta á almacenaxe tras a gravación Fío interrumpido Exportados os novos ficheiros - Non se atopou ficheiro doc.kml en KMZ + Non se atopou ficheiro kml en KMZ Perda Perda de altitude: %1$d m (%2$d ft) Fallou a exportación, comproba o directorio de exportación. diff --git a/src/main/res/values-hr/strings.xml b/src/main/res/values-hr/strings.xml index 344373260..448d55c52 100644 --- a/src/main/res/values-hr/strings.xml +++ b/src/main/res/values-hr/strings.xml @@ -379,7 +379,7 @@ limitations under the License. Ime paketa za javni API Neuspjelo traženje Bluetooth uređaja (greška %1$i). One se spremaju u internoj memoriji aplikacije (dostupne su samo unutar OpenTracksa). - U KMZ-u nije pronađena datoteka doc.kml + U KMZ-u nije pronađena datoteka kml Najave o neaktivnosti Otvori rutu W diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml index d31c9eba9..2479c6171 100644 --- a/src/main/res/values-hu/strings.xml +++ b/src/main/res/values-hu/strings.xml @@ -384,7 +384,7 @@ limitations under the License. GPS letiltva GPS rögzítve és készen áll Nem sikerült importálni a fájlt: %1$s - Nincs doc.kml fájl található a KMZ fájlban + Nincs kml fájl található a KMZ fájlban %1$s: %2$s Fájl %1$s importálva Beállítottad, hogy megakadályozd az újraimportálást diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml index 759a08a8c..e0b6d6813 100644 --- a/src/main/res/values-it/strings.xml +++ b/src/main/res/values-it/strings.xml @@ -425,7 +425,7 @@ Infatti, un\'applicazione deve supportare ACTION_VIEW con MIME applica Tracce saltate Tracce sovrascritte Nuove tracce esportate - Nessun file doc.kml trovato in KMZ + Nessun file kml trovato in KMZ File importati Esiste già Errori diff --git a/src/main/res/values-kn/strings.xml b/src/main/res/values-kn/strings.xml index 9f3016ccf..157b9aa55 100644 --- a/src/main/res/values-kn/strings.xml +++ b/src/main/res/values-kn/strings.xml @@ -191,7 +191,7 @@ ತ್ಯಜಿಸಿ ಟ್ರ್ಯಾಕ್ ಥ್ರೆಡ್ ಅಡಚಣೆಯಾಗಿದೆ - KMZ ನಲ್ಲಿ ಯಾವುದೇ doc.kml ಫೈಲ್ ಕಂಡುಬಂದಿಲ್ಲ + KMZ ನಲ್ಲಿ ಯಾವುದೇ kml ಫೈಲ್ ಕಂಡುಬಂದಿಲ್ಲ ಫೈಲ್ ಫಾರ್ಮ್ಯಾಟ್ ಬೆಂಬಲಿತವಾಗಿಲ್ಲ ಪಾರ್ಸರ್ ದೋಷ: %1$s ಫೈಲ್ ಅನ್ನು ಆಮದು ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ: %1$s diff --git a/src/main/res/values-lt/strings.xml b/src/main/res/values-lt/strings.xml index bddb7b989..bada70a4d 100644 --- a/src/main/res/values-lt/strings.xml +++ b/src/main/res/values-lt/strings.xml @@ -393,7 +393,7 @@ limitations under the License. Maksimalus širdies ritmas Kaip OpenTracks įrašo duomenis\? Per visą ekraną - KMZ nerastas doc.kml failas + KMZ nerastas kml failas Rato apskritimas (mm) Versijos kodas: %1$d Laikykite sustabdyti diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml index f06a9400f..14e7ed618 100644 --- a/src/main/res/values-nb/strings.xml +++ b/src/main/res/values-nb/strings.xml @@ -414,7 +414,7 @@ limitations under the License. Eksport etter opptak feilet. Sjekk eksportmappen. Nye filer eksportert Filer importert - Ingen doc.kml-fil funnet i KMZ + Ingen kml-fil funnet i KMZ Filer overskrevet Filer hoppet over Feil diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml index aa4d6a929..c24f92f5b 100644 --- a/src/main/res/values-nl/strings.xml +++ b/src/main/res/values-nl/strings.xml @@ -385,7 +385,7 @@ Als het GPS-apparaat onnauwkeurige gegevens rapporteert (bijv. locatie, snelheid Klik nogmaals terug om te annuleren Spoor export map Draad onderbroken - Geen doc.kml bestand gevonden in KMZ + Geen kml bestand gevonden in KMZ Volledig scherm GPS vast en klaar Neem uw eerste route op om geaggregeerde statistieken te zien diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml index d372ab4e6..c52e7627b 100644 --- a/src/main/res/values-pl/strings.xml +++ b/src/main/res/values-pl/strings.xml @@ -431,7 +431,7 @@ limitations under the License. Już istnieje Pliki importowane Plik %1$s zaimportowany - W pliku KMZ nie znaleziono pliku doc.kml + W pliku KMZ nie znaleziono pliku kml %1$s: %2$s Prędkość: %1$s Szybkość: %1$s diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml index 516176ca2..200c87e14 100644 --- a/src/main/res/values-pt-rBR/strings.xml +++ b/src/main/res/values-pt-rBR/strings.xml @@ -365,7 +365,7 @@ A exportação pós-treino falhou, verifique o diretório de exportação. Perda de elevação: %1$d m (%2$d ft) Novas trilhas exportadas - Nenhum arquivo doc.kml encontrado no KMZ + Nenhum arquivo kml encontrado no KMZ Impedir a reimportação de trilhas Trilhas sobrescritas Trilhas puladas diff --git a/src/main/res/values-pt-rPT/strings.xml b/src/main/res/values-pt-rPT/strings.xml index 7f806d265..159a3c6ca 100644 --- a/src/main/res/values-pt-rPT/strings.xml +++ b/src/main/res/values-pt-rPT/strings.xml @@ -390,7 +390,7 @@ Formato de ficheiro não suportado Erro do analisador: %1$s Não foi possível importar o ficheiro: %1$s - Nenhum ficheiro doc.kml encontrado no KMZ + Nenhum ficheiro kml encontrado no KMZ %1$s: %2$s Ficheiros não importados Ficheiro %1$s importado diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml index add220412..3437b7d31 100644 --- a/src/main/res/values-pt/strings.xml +++ b/src/main/res/values-pt/strings.xml @@ -426,7 +426,7 @@ limitations under the License. Formato de ficheiro não suportado Erro do analisador: %1$s Não foi possível importar o ficheiro: %1$s - Nenhum ficheiro doc.kml encontrado no KMZ + Nenhum ficheiro kml encontrado no KMZ Ficheiro %1$s importado Definiu evitar reimportar a trilha Ficheiros importados diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml index cee16a04a..ed3508531 100644 --- a/src/main/res/values-ro/strings.xml +++ b/src/main/res/values-ro/strings.xml @@ -395,7 +395,7 @@ limitations under the License. Max Cadență Nu a fost posibilă scanarea pentru dispozitive Bluetooth (eroare %1$i). Aș dori să vă împărtășesc o imagine - Nu s-a găsit niciun fișier doc.kml în KMZ + Nu s-a găsit niciun fișier kml în KMZ Împiedicați reimportul de piese Fișierele importate OpenTracks necesită permisiunea de a utiliza GPS. diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml index 49c3300ca..a39eaec58 100644 --- a/src/main/res/values-ru/strings.xml +++ b/src/main/res/values-ru/strings.xml @@ -352,7 +352,7 @@ limitations under the License. Файл %1$s импортирован Файлы не импортированы %1$s: %2$s - Файл doc.kml не найден в KMZ + Файл kml не найден в KMZ Невозможно импортировать файл: %1$s Ошибка обработки: %1$s Неподдерживаемый формат файла diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml index 1e5d11c87..50ee71661 100644 --- a/src/main/res/values-sk/strings.xml +++ b/src/main/res/values-sk/strings.xml @@ -396,7 +396,7 @@ limitations under the License. Vložiť obrázok do galérie Rýchlosť hlasu Nie je možné importovať súbor: %1$s - V KMZ nebol nájdený žiadny súbor doc.kml + V KMZ nebol nájdený žiadny súbor kml Zrušiť GPS pevná a pripravená %1$s: %2$s diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml index 66f556677..470a97d87 100644 --- a/src/main/res/values-sv/strings.xml +++ b/src/main/res/values-sv/strings.xml @@ -411,7 +411,7 @@ limitations under the License. Spår kan exporteras från inställningarna som KMZ, KML eller GPX. KMZ/KML alla data; GPX endast platser. Spår som delas via delningsikonen delas som KMZ. Om OpenTracks Fel - Ingen doc.KML-filen finns i KMZ + Ingen kml-filen finns i KMZ Du har angett förhindra åter importera spår Återuppta spår Filformat som inte stöds diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml index c31da20f8..9fb8c2bf5 100644 --- a/src/main/res/values-tr/strings.xml +++ b/src/main/res/values-tr/strings.xml @@ -351,7 +351,7 @@ limitations under the License. Ayrıştırıcı hatası: %1$s Dosya içe aktarılamıyor: %1$s Desteklenmeyen dosya formatı - KMZ\'de doc.kml dosyası bulunamadı + KMZ\'de kml dosyası bulunamadı %1$s: %2$s Dosyalar içe aktarılmadı Filtrele diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml index 4e9c68cc8..ac280862b 100644 --- a/src/main/res/values-uk/strings.xml +++ b/src/main/res/values-uk/strings.xml @@ -371,7 +371,7 @@ limitations under the License. Поток перервано Формат файлу не підтримується Помилка парсера: %1$s - Файл doc.kml не знайдено в KMZ + Файл kml не знайдено в KMZ Файли не імпортовано %1$s:%2$s Скасовано, фото-маркування не додано diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml index 532a1a22f..e46e9f7f8 100644 --- a/src/main/res/values-vi/strings.xml +++ b/src/main/res/values-vi/strings.xml @@ -390,7 +390,7 @@ limitations under the License. Đã hủy, không có dấu ảnh nào được thêm Hoàn tất Lỗi - Không tìm thấy tệp doc.kml nào trong KMZ + Không tìm thấy tệp kml nào trong KMZ xe scooter điện Đã hoàn tất với %1$d lỗi diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml index 64b57ef94..cbc23dcf9 100644 --- a/src/main/res/values-zh-rTW/strings.xml +++ b/src/main/res/values-zh-rTW/strings.xml @@ -239,7 +239,7 @@ limitations under the License. 未支援的檔案格式 分析器錯誤:%1$s 無法匯入檔案:%1$s - 在 KMZ 中沒有發現 doc.kml 檔案 + 在 KMZ 中沒有發現 kml 檔案 %1$s:%2$s 檔案未匯入 檔案 %1$s 已匯入 diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml index 12c1860ae..393f39236 100644 --- a/src/main/res/values-zh/strings.xml +++ b/src/main/res/values-zh/strings.xml @@ -578,7 +578,7 @@ limitations under the License. 健身 今天 昨天 - 在 KMZ 中没有找到 doc.kml 文件 + 在 KMZ 中没有找到 kml 文件 %1$s:%2$s 文件未导入 文件 %1$s 已导入 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 756e3a42a..a94cad703 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -267,7 +267,7 @@ limitations under the License. Unsupported file format Parser error: %1$s Unable to import file: %1$s - No doc.kml file found in KMZ + No kml file found in KMZ %1$s: %2$s Files not imported File %1$s imported