gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Merge pull request #2532 from trashkalmar/downloader-fixes

Browse source 
[new downloader][android] fix: Show country name during migration.
This commit is contained in:
Dmitry Yunitsky 2016-03-25 17:09:36 +03:00
commit 0e4327d535
63 changed files with 35 additions and 137 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/jni/com/mapswithme/maps/Framework.cpp
View file

@ -422,10 +422,10 @@ void Framework::Migrate(bool keepOldMaps)
m_work.Migrate(keepOldMaps);
}
bool Framework::PreMigrate(ms::LatLon const & position, Storage::TChangeCountryFunction const & statusChangeListener,
Storage::TProgressFunction const & progressListener)
storage::TCountryId Framework::PreMigrate(ms::LatLon const & position, Storage::TChangeCountryFunction const & statusChangeListener,
Storage::TProgressFunction const & progressListener)
{
return (m_work.PreMigrate(position, statusChangeListener, progressListener) != kInvalidCountryId);
return m_work.PreMigrate(position, statusChangeListener, progressListener);
}
} // namespace android

4
android/jni/com/mapswithme/maps/Framework.hpp
View file

@ -151,8 +151,8 @@ namespace android
place_page::Info & GetPlacePageInfo();
bool HasSpaceForMigration();
bool PreMigrate(ms::LatLon const & position, storage::Storage::TChangeCountryFunction const & statusChangeListener,
storage::Storage::TProgressFunction const & progressListener);
storage::TCountryId PreMigrate(ms::LatLon const & position, storage::Storage::TChangeCountryFunction const & statusChangeListener,
storage::Storage::TProgressFunction const & progressListener);
void Migrate(bool keepOldMaps);
private:

21
android/jni/com/mapswithme/maps/MapManager.cpp
View file

@ -121,8 +121,8 @@ static void OnMigrationError(NodeErrorCode error)
static void MigrationStatusChangedCallback(TCountryId const & countryId, bool keepOldMaps)
{
NodeAttrs attrs;
GetStorage().GetPrefetchStorage()->GetNodeAttrs(countryId, attrs);
NodeStatuses attrs;
GetStorage().GetPrefetchStorage()->GetNodeStatuses(countryId, attrs);
switch (attrs.m_status)
{
@ -132,7 +132,7 @@ static void MigrationStatusChangedCallback(TCountryId const & countryId, bool ke
case NodeStatus::Undefined:
case NodeStatus::Error:
if (attrs.m_mwmCounter == 1)
if (!attrs.m_groupNode)
OnMigrationError(attrs.m_error);
break;
@ -149,8 +149,8 @@ static void MigrationProgressCallback(TCountryId const & countryId, TLocalAndRem
env->CallVoidMethod(g_migrationListener, callback, static_cast<jint>(sizes.first * 100 / sizes.second));
}
// static boolean nativeMigrate(MigrationListener listener, double lat, double lon, boolean hasLocation, boolean keepOldMaps);
JNIEXPORT jboolean JNICALL
// static @Nullable String nativeMigrate(MigrationListener listener, double lat, double lon, boolean hasLocation, boolean keepOldMaps);
JNIEXPORT jstring JNICALL
Java_com_mapswithme_maps_downloader_MapManager_nativeMigrate(JNIEnv * env, jclass clazz, jobject listener, jdouble lat, jdouble lon, jboolean hasLocation, jboolean keepOldMaps)
{
ms::LatLon position{};
@ -159,14 +159,17 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeMigrate(JNIEnv * env, jclas
g_migrationListener = env->NewGlobalRef(listener);
if (g_framework->PreMigrate(position, bind(&MigrationStatusChangedCallback, _1, keepOldMaps),
bind(&MigrationProgressCallback, _1, _2)))
TCountryId id = g_framework->PreMigrate(position, bind(&MigrationStatusChangedCallback, _1, keepOldMaps),
bind(&MigrationProgressCallback, _1, _2));
if (id != kInvalidCountryId)
{
return true;
NodeAttrs attrs;
GetStorage().GetPrefetchStorage()->GetNodeAttrs(id, attrs);
return jni::ToJavaString(env, attrs.m_nodeLocalName);
}
OnPrefetchComplete(keepOldMaps);
return false;
return nullptr;
}
// static void nativeCancelMigration();

1
android/res/layout/fragment_migrate.xml
View file

@ -55,7 +55,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/margin_base"
android:text="@string/migration_prefetch_status"
android:textAppearance="@style/MwmTextAppearance.Body3"/>
<FrameLayout

1
android/res/values-ar/strings.xml
View file

@ -754,7 +754,6 @@
<string name="downloader_search_field_hint">اعثر على الخريطة</string>
<string name="migration_update_all_button">تحديث جميع الخرائط</string>
<string name="migration_delete_all_download_current_button">تنزيل الخريطة الحالية وحذف الخرائط القديمة</string>
<string name="migration_prefetch_status">جار الإعداد لتحديث الخرائط…</string>
<string name="migration_download_error_dialog">خطأ بالتنزيل</string>
<string name="common_check_internet_connection_dialog">يرجى التحقق من الإعدادات والتأكد من اتصال جهازك بالإنترنت.</string>
<string name="downloader_no_space_title">مساحة غير كافية</string>

1
android/res/values-cs/strings.xml
View file

@ -755,7 +755,6 @@
<string name="downloader_search_field_hint">Najít mapu</string>
<string name="migration_update_all_button">Aktualizovat všechny mapy</string>
<string name="migration_delete_all_download_current_button">Stáhněte si aktuální mapu a odstraňte staré</string>
<string name="migration_prefetch_status">Probíhá příprava na aktualizace map…</string>
<string name="migration_download_error_dialog">Chyba při stahování</string>
<string name="common_check_internet_connection_dialog">Zkontrolujte prosím své nastavení a ujistěte se, že je vaše zařízení připojeno k internetu.</string>
<string name="downloader_no_space_title">Nedostatek místa</string>

1
android/res/values-da/strings.xml
View file

@ -750,7 +750,6 @@
<string name="downloader_search_field_hint">Find kortet</string>
<string name="migration_update_all_button">Opdatér alle kort</string>
<string name="migration_delete_all_download_current_button">Download aktuelt kort og slet de gamle</string>
<string name="migration_prefetch_status">Forbereder kortopdatering…</string>
<string name="migration_download_error_dialog">Fejl ved download</string>
<string name="common_check_internet_connection_dialog">Tjek dine indstillinger og sørg for, din enhed er forbundet til internettet.</string>
<string name="downloader_no_space_title">Ikke nok plads</string>

1
android/res/values-de/strings.xml
View file

@ -770,7 +770,6 @@
<string name="downloader_search_field_hint">Karte finden</string>
<string name="migration_update_all_button">Alle Karten aktualisieren</string>
<string name="migration_delete_all_download_current_button">Laden Sie die aktuelle Karte herunter und löschen Sie alte Karten</string>
<string name="migration_prefetch_status">Karten-Update wird vorbereitet …</string>
<string name="migration_download_error_dialog">Download-Fehler</string>
<string name="common_check_internet_connection_dialog">Bitte überprüfen Sie Ihre Einstellungen und stellen Sie sicher, dass Ihr Gerät mit dem Internet verbunden ist.</string>
<string name="downloader_no_space_title">Nicht genügend Platz</string>

1
android/res/values-es/strings.xml
View file

@ -743,7 +743,6 @@
<string name="downloader_search_field_hint">Encontrar el mapa</string>
<string name="migration_update_all_button">Actualizar todos los mapas</string>
<string name="migration_delete_all_download_current_button">Descargar el mapa actual y eliminar los mapas antiguos</string>
<string name="migration_prefetch_status">Preparando la actualización de mapas…</string>
<string name="migration_download_error_dialog">Error de descarga</string>
<string name="common_check_internet_connection_dialog">Por favor, verifica la configuración y asegúrate de que tu dispositivo está conectado a Internet.</string>
<string name="downloader_no_space_title">Sin espacio suficiente</string>

1
android/res/values-fi/strings.xml
View file

@ -748,7 +748,6 @@
<string name="downloader_search_field_hint">Etsi kartta</string>
<string name="migration_update_all_button">Päivitä kaikki kartat</string>
<string name="migration_delete_all_download_current_button">Lataa nykyinen kartta ja poista kaikki vanhat kartat</string>
<string name="migration_prefetch_status">Karttojen päivitystä ladataan…</string>
<string name="migration_download_error_dialog">Latausvirhe</string>
<string name="common_check_internet_connection_dialog">Tarkista asetuksesi ja varmista, että laitteesi on yhteydessä Internetiin.</string>
<string name="downloader_no_space_title">Ei tarpeeksi tilaa</string>

1
android/res/values-fr/strings.xml
View file

@ -759,7 +759,6 @@
<string name="downloader_search_field_hint">Trouver la carte</string>
<string name="migration_update_all_button">Mettre à jour toutes les cartes</string>
<string name="migration_delete_all_download_current_button">Téléchargez la carte actuelle et supprimez les anciennes</string>
<string name="migration_prefetch_status">Préparation de la mise à jour des cartes…</string>
<string name="migration_download_error_dialog">Erreur de téléchargement</string>
<string name="common_check_internet_connection_dialog">Veuillez vérifier vos paramètres et vous assurer que votre appareil est bien connecté à Internet.</string>
<string name="downloader_no_space_title">Espace insuffisant</string>

1
android/res/values-hu/strings.xml
View file

@ -749,7 +749,6 @@
<string name="downloader_search_field_hint">Térkép keresése</string>
<string name="migration_update_all_button">Minden térkép frissítése</string>
<string name="migration_delete_all_download_current_button">Töltsd le a jelenlegi térképet és töröld a régieket</string>
<string name="migration_prefetch_status">Térképfrissítések előkészítése…</string>
<string name="migration_download_error_dialog">Letöltési hiba</string>
<string name="common_check_internet_connection_dialog">Kérjük, ellenőrizd a beállításaid és győződj meg arról, hogy a készüléked kapcsolódik az internethez.</string>
<string name="downloader_no_space_title">Nincs elegendő tárhely</string>

1
android/res/values-in/strings.xml
View file

@ -747,7 +747,6 @@
<string name="downloader_search_field_hint">Temukan peta</string>
<string name="migration_update_all_button">Perbarui semua peta</string>
<string name="migration_delete_all_download_current_button">Unduh peta sekarang dan hapus peta lama</string>
<string name="migration_prefetch_status">Mempersiapkan pembaruan peta…</string>
<string name="migration_download_error_dialog">Unduh kesalahan</string>
<string name="common_check_internet_connection_dialog">Harap memeriksa pengaturan Anda dan pastikan perangkat Anda terhubung dengan internet.</string>
<string name="downloader_no_space_title">Tidak cukup ruang</string>

1
android/res/values-it/strings.xml
View file

@ -747,7 +747,6 @@
<string name="downloader_search_field_hint">Trova la mappa</string>
<string name="migration_update_all_button">Aggiorna tutte le mappe</string>
<string name="migration_delete_all_download_current_button">Scarica la mappa attuale e cancella quelle vecchie</string>
<string name="migration_prefetch_status">Preparazione aggiornamento delle mappe…</string>
<string name="migration_download_error_dialog">Errore nel download</string>
<string name="common_check_internet_connection_dialog">Sei pregato di verificare le tue impostazioni e assicurarti che il tuo dispositivo sia connesso a internet.</string>
<string name="downloader_no_space_title">Spazio insufficiente</string>

1
android/res/values-ja/strings.xml
View file

@ -747,7 +747,6 @@
<string name="downloader_search_field_hint">地図を検索</string>
<string name="migration_update_all_button">全ての地図をアップデート</string>
<string name="migration_delete_all_download_current_button">現在の地図をダウンロードして古い地図を削除</string>
<string name="migration_prefetch_status">地図のアップデートの準備中…</string>
<string name="migration_download_error_dialog">ダウンロードエラー</string>
<string name="common_check_internet_connection_dialog">設定をチェックし、デバイスがインターネットに接続されているか確認してください。</string>
<string name="downloader_no_space_title">十分な空き容量がありません</string>

1
android/res/values-ko/strings.xml
View file

@ -740,7 +740,6 @@
<string name="downloader_search_field_hint">지도 찾기</string>
<string name="migration_update_all_button">모든지도 업데이트</string>
<string name="migration_delete_all_download_current_button">현재 지도 다운로드 및 기존 지도 삭제</string>
<string name="migration_prefetch_status">지도 업데이트 준비 중…</string>
<string name="migration_download_error_dialog">다운로드 오류</string>
<string name="common_check_internet_connection_dialog">설정을 확인하고 장치가 인터넷에 연결되어 있는지 확인하십시오.</string>
<string name="downloader_no_space_title">충분하지 않은 여유 공간</string>

1
android/res/values-nb/strings.xml
View file

@ -748,7 +748,6 @@
<string name="downloader_search_field_hint">Finn kartet</string>
<string name="migration_update_all_button">Oppdater alle kart</string>
<string name="migration_delete_all_download_current_button">Last ned det oppdaterte kartet og slett de gamle</string>
<string name="migration_prefetch_status">Forbereder oppdatering av kart…</string>
<string name="migration_download_error_dialog">Nedlastningsfeil</string>
<string name="common_check_internet_connection_dialog">Kontroller innstillingene dine og sørg for at enheten din er koblet til internett.</string>
<string name="downloader_no_space_title">Ikke nok plass</string>

1
android/res/values-nl/strings.xml
View file

@ -738,7 +738,6 @@
<string name="downloader_search_field_hint">Vind de kaart</string>
<string name="migration_update_all_button">Update alle kaarten</string>
<string name="migration_delete_all_download_current_button">Download de huidige kaart en verwijder de oude</string>
<string name="migration_prefetch_status">Het voorbereiden van de update van de kaart…</string>
<string name="migration_download_error_dialog">Downloadfout</string>
<string name="common_check_internet_connection_dialog">Controleer je instellingen en zorg ervoor dat het apparaat is verbonden met het internet.</string>
<string name="downloader_no_space_title">Niet genoeg ruimte</string>

1
android/res/values-pl/strings.xml
View file

@ -749,7 +749,6 @@
<string name="downloader_search_field_hint">Znajdź mapę</string>
<string name="migration_update_all_button">Aktualizuj wszystkie mapy</string>
<string name="migration_delete_all_download_current_button">Pobierz bieżącą mapę i usuń stare</string>
<string name="migration_prefetch_status">Przygotowywanie aktualizacji map…</string>
<string name="migration_download_error_dialog">Błąd pobierania</string>
<string name="common_check_internet_connection_dialog">Sprawdź swoje ustawienia i upewnij się, że urządzenie ma połączenie z Internetem.</string>
<string name="downloader_no_space_title">Brak wolnego miejsca</string>

1
android/res/values-pt/strings.xml
View file

@ -745,7 +745,6 @@
<string name="downloader_search_field_hint">Encontrar o mapa</string>
<string name="migration_update_all_button">Atualizar todos os mapas</string>
<string name="migration_delete_all_download_current_button">Descarregue o mapa atual e elimine os antigos</string>
<string name="migration_prefetch_status">A preparar a atualização de mapas…</string>
<string name="migration_download_error_dialog">Erro de download</string>
<string name="common_check_internet_connection_dialog">Por favor, verifique as suas opções e certifique-se de que o dispositivo está ligado à Internet.</string>
<string name="downloader_no_space_title">Não há espaço suficiente</string>

1
android/res/values-ro/strings.xml
View file

@ -745,7 +745,6 @@
<string name="downloader_search_field_hint">Găsiți harta</string>
<string name="migration_update_all_button">Actualizați toate hărțile</string>
<string name="migration_delete_all_download_current_button">Descărcați harta actuală și ștergeți toate hărțile vechi</string>
<string name="migration_prefetch_status">Pregătește actualizarea hărților…</string>
<string name="migration_download_error_dialog">Eroare de descărcare</string>
<string name="common_check_internet_connection_dialog">Vă rugăm să vă verificați setările și să vă asigurați că dispozitivul dvs. este conectat la Internet.</string>
<string name="downloader_no_space_title">Spațiu insuficient</string>

1
android/res/values-ru/strings.xml
View file

@ -781,7 +781,6 @@
<string name="downloader_search_field_hint">Найти карту</string>
<string name="migration_update_all_button">Обновить все карты</string>
<string name="migration_delete_all_download_current_button">Скачать текущую и удалить все старые карты</string>
<string name="migration_prefetch_status">Подготовка обновления карт…</string>
<string name="migration_download_error_dialog">Ошибка загрузки</string>
<string name="common_check_internet_connection_dialog">Проверьте настройки и убедитесь, что устройство подключено к интернету.</string>
<string name="downloader_no_space_title">Недостаточно места</string>

1
android/res/values-sk/strings.xml
View file

@ -751,7 +751,6 @@
<string name="downloader_search_field_hint">Nájsť mapu</string>
<string name="migration_update_all_button">Aktualizovať všetky mapy</string>
<string name="migration_delete_all_download_current_button">Stiahnite si aktuálnu mapu a odstráňte neaktuálne mapy</string>
<string name="migration_prefetch_status">Prebieha príprava aktualizácie máp…</string>
<string name="migration_download_error_dialog">Chyba pri sťahovaní</string>
<string name="common_check_internet_connection_dialog">Prosím, skontrolujte svoje nastavenia a uistite sa, že váš počítač je pripojený k internetu.</string>
<string name="downloader_no_space_title">Nemáte dostatok miesta</string>

1
android/res/values-sv/strings.xml
View file

@ -752,7 +752,6 @@
<string name="downloader_search_field_hint">Hitta kartan</string>
<string name="migration_update_all_button">Uppdatera alla kartor</string>
<string name="migration_delete_all_download_current_button">Ladda ned senaste kartan och radera de gamla</string>
<string name="migration_prefetch_status">Förbereder kartuppdatering…</string>
<string name="migration_download_error_dialog">Nedladdningsfel</string>
<string name="common_check_internet_connection_dialog">Kontrollera dina inställningar och se till att din enhet är ansluten till internet.</string>
<string name="downloader_no_space_title">Ej tillräckligt utrymme</string>

1
android/res/values-th/strings.xml
View file

@ -752,7 +752,6 @@
<string name="downloader_search_field_hint">ค้นหาแผนที่</string>
<string name="migration_update_all_button">อัปเดตแผนที่ทั้งหมด</string>
<string name="migration_delete_all_download_current_button">ดาวน์โหลดแผนที่ปัจจุบันและลบแผนที่เก่า</string>
<string name="migration_prefetch_status">กำลังเตรียมการอัปเดตแผนที่…</string>
<string name="migration_download_error_dialog">ข้อผิดพลาดในการดาวน์โหลด</string>
<string name="common_check_internet_connection_dialog">กรุณาตรวจสอบการตั้งค่าของคุณแล้วทำให้แน่ใจว่าอุปกรณ์ของคุณได้รับการเชื่อมต่ออินเทอร์เน็ต</string>
<string name="downloader_no_space_title">มีพื้นที่ไม่เพียงพอ</string>

1
android/res/values-tr/strings.xml
View file

@ -754,7 +754,6 @@
<string name="downloader_search_field_hint">Harita bul</string>
<string name="migration_update_all_button">Haritaları güncelle</string>
<string name="migration_delete_all_download_current_button">Mevcut haritayı indir ve tüm eski haritaları sil</string>
<string name="migration_prefetch_status">Harita güncellemesi hazırlanıyor…</string>
<string name="migration_download_error_dialog">İndirme hatası</string>
<string name="common_check_internet_connection_dialog">Lütfen ayarlarınızı kontrol edin ve cihazınızın internete bağlı olduğundan emin olun.</string>
<string name="downloader_no_space_title">Yeterli alan yok</string>

1
android/res/values-uk/strings.xml
View file

@ -751,7 +751,6 @@
<string name="downloader_search_field_hint">Знайти карту</string>
<string name="migration_update_all_button">Оновити всі карти</string>
<string name="migration_delete_all_download_current_button">Завантажте поточну карту і видаліть старі</string>
<string name="migration_prefetch_status">Підготовка до оновлення карт…</string>
<string name="migration_download_error_dialog">Помилка завантаження</string>
<string name="common_check_internet_connection_dialog">Будь ласка, перевірте свої налаштування і переконайтеся, що ваш пристрій підлючено до Інтернету.</string>
<string name="downloader_no_space_title">Недостатньо місця</string>

1
android/res/values-vi/strings.xml
View file

@ -748,7 +748,6 @@
<string name="downloader_search_field_hint">Tìm bản đồ</string>
<string name="migration_update_all_button">Cập nhật tất cả các bản đồ</string>
<string name="migration_delete_all_download_current_button">Tải xuống bản đồ hiện tại và xóa những bản đồ cũ</string>
<string name="migration_prefetch_status">Đang chuẩn bị cập nhật các bản đồ…</string>
<string name="migration_download_error_dialog">Lỗi tải xuống</string>
<string name="common_check_internet_connection_dialog">Xin kiểm tra các thiết lập và đảm bảo thiết bị của bạn có kết nối Internet.</string>
<string name="downloader_no_space_title">Không đủ dung lượng</string>

1
android/res/values-zh-rTW/strings.xml
View file

@ -734,7 +734,6 @@
<string name="downloader_search_field_hint">找到地圖</string>
<string name="migration_update_all_button">更新全部地圖</string>
<string name="migration_delete_all_download_current_button">下載當前地圖並刪除舊地圖</string>
<string name="migration_prefetch_status">正在準備地圖更新…</string>
<string name="migration_download_error_dialog">下載錯誤</string>
<string name="common_check_internet_connection_dialog">請檢查您的設置並確保您的設備已連接至網絡。</string>
<string name="downloader_no_space_title">無足夠的空間</string>

1
android/res/values-zh/strings.xml
View file

@ -754,7 +754,6 @@
<string name="downloader_search_field_hint">找到地图</string>
<string name="migration_update_all_button">更新全部地图</string>
<string name="migration_delete_all_download_current_button">下载当前地图并删除旧地图</string>
<string name="migration_prefetch_status">正在准备地图更新…</string>
<string name="migration_download_error_dialog">下载错误</string>
<string name="common_check_internet_connection_dialog">请检查您的设置并确保您的设备已连接至网络。</string>
<string name="downloader_no_space_title">无足够的空间</string>

1
android/res/values/strings.xml
View file

@ -785,7 +785,6 @@
<string name="downloader_search_field_hint">Find the map</string>
<string name="migration_update_all_button">Update All Maps</string>
<string name="migration_delete_all_download_current_button">Download current map and delete the old ones</string>
<string name="migration_prefetch_status">Preparing maps update…</string>
<string name="migration_download_error_dialog">Download error</string>
<string name="common_check_internet_connection_dialog">Please check your settings and make sure your device is connected to the internet.</string>
<string name="downloader_no_space_title">Not enough space</string>

7
android/src/com/mapswithme/maps/downloader/MapManager.java
View file

@ -137,10 +137,11 @@ public final class MapManager
/**
* Performs migration from old (large MWMs) mode.
* @return {@code true} if prefetch was started. {@code false} if maps were queued to downloader and migration process is complete.
* In this case {@link MigrationListener#onComplete()} will be called before return from {@code nativeMigrate()}.
* @return Name of the country to be loaded during the prefetch.
* Or {@code null} if maps were queued to downloader and migration process is complete.
* In the latter case {@link MigrationListener#onComplete()} will be called before return from {@code nativeMigrate()}.
*/
public static native boolean nativeMigrate(MigrationListener listener, double lat, double lon, boolean hasLocation, boolean keepOldMaps);
public static native @Nullable String nativeMigrate(MigrationListener listener, double lat, double lon, boolean hasLocation, boolean keepOldMaps);
/**
* Aborts migration. Affects only prefetch process.

8
android/src/com/mapswithme/maps/downloader/MigrationController.java
View file

@ -19,7 +19,7 @@ final class MigrationController
interface Container
{
void setReadyState();
void setProgressState();
void setProgressState(String countryName);
void setErrorState(int code);
void onComplete();
@ -30,6 +30,7 @@ final class MigrationController
private Container mContainer;
private State mState;
private String mPrefetchingCountry;
private int mProgress;
private int mError;
@ -90,7 +91,7 @@ final class MigrationController
private void callStateProgress()
{
if (mContainer != null)
mContainer.setProgressState();
mContainer.setProgressState(mPrefetchingCountry);
}
private void callStateError()
@ -152,7 +153,8 @@ final class MigrationController
double lat = (loc == null ? 0.0 : loc.getLatitude());
double lon = (loc == null ? 0.0 : loc.getLongitude());
if (!MapManager.nativeMigrate(mListener, lat, lon, (loc != null), keepOld))
mPrefetchingCountry = MapManager.nativeMigrate(mListener, lat, lon, (loc != null), keepOld);
if (mPrefetchingCountry == null)
return;
mState = State.PROGRESS;

11
android/src/com/mapswithme/maps/downloader/MigrationFragment.java
View file

@ -24,7 +24,7 @@ public class MigrationFragment extends BaseMwmFragment
MigrationController.Container
{
private TextView mError;
private View mPrepare;
private TextView mPrepare;
private WheelProgressView mProgress;
private Button mButtonPrimary;
private Button mButtonSecondary;
@ -56,7 +56,7 @@ public class MigrationFragment extends BaseMwmFragment
super.onViewCreated(view, savedInstanceState);
mError = (TextView) view.findViewById(R.id.error);
mPrepare = view.findViewById(R.id.preparation);
mPrepare = (TextView) view.findViewById(R.id.preparation);
mProgress = (WheelProgressView) view.findViewById(R.id.progress);
mButtonPrimary = (Button) view.findViewById(R.id.button_primary);
mButtonSecondary = (Button) view.findViewById(R.id.button_secondary);
@ -107,10 +107,11 @@ public class MigrationFragment extends BaseMwmFragment
}
@Override
public void setProgressState()
public void setProgressState(String countryName)
{
UiUtils.show(mPrepare, mProgress);
UiUtils.hide(mError, mButtonPrimary, mButtonSecondary);
mPrepare.setText(String.format("%1$2s %2$s", getString(R.string.downloader_downloading), countryName));
}
@Override
@ -155,7 +156,9 @@ public class MigrationFragment extends BaseMwmFragment
@Override
public void setProgress(int percents)
{
mProgress.setProgress(percents);
mProgress.setPending(percents == 0);
if (percents > 0)
mProgress.setProgress(percents);
}
@Override

3
android/src/com/mapswithme/maps/downloader/OnmapDownloader.java
View file

@ -8,6 +8,7 @@ import android.widget.Button;
import android.widget.TextView;
import java.util.List;
import java.util.Locale;
import com.mapswithme.maps.MwmActivity;
import com.mapswithme.maps.R;
@ -116,7 +117,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
{
mProgress.setPending(false);
mProgress.setProgress(mCurrentCountry.progress);
sizeText = mCurrentCountry.progress + "%";
sizeText = String.format(Locale.US, "%1$s %2$d%%", mActivity.getString(R.string.downloader_downloading), mCurrentCountry.progress);
}
else
{

2
iphone/Maps/ar.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "تنزيل الخريطة الحالية وحذف الخرائط القديمة";
"migration_prefetch_status" = "جار الإعداد لتحديث الخرائط…";
"migration_download_error_dialog" = "خطأ بالتنزيل";
"common_check_internet_connection_dialog" = "يرجى التحقق من الإعدادات والتأكد من اتصال جهازك بالإنترنت.";

2
iphone/Maps/cs.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Stáhněte si aktuální mapu a odstraňte staré";
"migration_prefetch_status" = "Probíhá příprava na aktualizace map…";
"migration_download_error_dialog" = "Chyba při stahování";
"common_check_internet_connection_dialog" = "Zkontrolujte prosím své nastavení a ujistěte se, že je vaše zařízení připojeno k internetu.";

2
iphone/Maps/da.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Download aktuelt kort og slet de gamle";
"migration_prefetch_status" = "Forbereder kortopdatering…";
"migration_download_error_dialog" = "Fejl ved download";
"common_check_internet_connection_dialog" = "Tjek dine indstillinger og sørg for, din enhed er forbundet til internettet.";

2
iphone/Maps/de.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Laden Sie die aktuelle Karte herunter und löschen Sie alte Karten";
"migration_prefetch_status" = "Karten-Update wird vorbereitet …";
"migration_download_error_dialog" = "Download-Fehler";
"common_check_internet_connection_dialog" = "Bitte überprüfen Sie Ihre Einstellungen und stellen Sie sicher, dass Ihr Gerät mit dem Internet verbunden ist.";

2
iphone/Maps/en.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Download current map and delete the old ones";
"migration_prefetch_status" = "Preparing maps update…";
"migration_download_error_dialog" = "Download error";
"common_check_internet_connection_dialog" = "Please check your settings and make sure your device is connected to the internet.";

2
iphone/Maps/es.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Descargar el mapa actual y eliminar los mapas antiguos";
"migration_prefetch_status" = "Preparando la actualización de mapas…";
"migration_download_error_dialog" = "Error de descarga";
"common_check_internet_connection_dialog" = "Por favor, verifica la configuración y asegúrate de que tu dispositivo está conectado a Internet.";

2
iphone/Maps/fi.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Lataa nykyinen kartta ja poista kaikki vanhat kartat";
"migration_prefetch_status" = "Karttojen päivitystä ladataan…";
"migration_download_error_dialog" = "Latausvirhe";
"common_check_internet_connection_dialog" = "Tarkista asetuksesi ja varmista, että laitteesi on yhteydessä Internetiin.";

2
iphone/Maps/fr.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Téléchargez la carte actuelle et supprimez les anciennes";
"migration_prefetch_status" = "Préparation de la mise à jour des cartes…";
"migration_download_error_dialog" = "Erreur de téléchargement";
"common_check_internet_connection_dialog" = "Veuillez vérifier vos paramètres et vous assurer que votre appareil est bien connecté à Internet.";

2
iphone/Maps/hu.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Töltsd le a jelenlegi térképet és töröld a régieket";
"migration_prefetch_status" = "Térképfrissítések előkészítése…";
"migration_download_error_dialog" = "Letöltési hiba";
"common_check_internet_connection_dialog" = "Kérjük, ellenőrizd a beállításaid és győződj meg arról, hogy a készüléked kapcsolódik az internethez.";

2
iphone/Maps/id.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Unduh peta sekarang dan hapus peta lama";
"migration_prefetch_status" = "Mempersiapkan pembaruan peta…";
"migration_download_error_dialog" = "Unduh kesalahan";
"common_check_internet_connection_dialog" = "Harap memeriksa pengaturan Anda dan pastikan perangkat Anda terhubung dengan internet.";

2
iphone/Maps/it.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Scarica la mappa attuale e cancella quelle vecchie";
"migration_prefetch_status" = "Preparazione aggiornamento delle mappe…";
"migration_download_error_dialog" = "Errore nel download";
"common_check_internet_connection_dialog" = "Sei pregato di verificare le tue impostazioni e assicurarti che il tuo dispositivo sia connesso a internet.";

2
iphone/Maps/ja.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "現在の地図をダウンロードして古い地図を削除";
"migration_prefetch_status" = "地図のアップデートの準備中…";
"migration_download_error_dialog" = "ダウンロードエラー";
"common_check_internet_connection_dialog" = "設定をチェックし、デバイスがインターネットに接続されているか確認してください。";

2
iphone/Maps/ko.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "현재 지도 다운로드 및 기존 지도 삭제";
"migration_prefetch_status" = "지도 업데이트 준비 중…";
"migration_download_error_dialog" = "다운로드 오류";
"common_check_internet_connection_dialog" = "설정을 확인하고 장치가 인터넷에 연결되어 있는지 확인하십시오.";

2
iphone/Maps/nb.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Last ned det oppdaterte kartet og slett de gamle";
"migration_prefetch_status" = "Forbereder oppdatering av kart…";
"migration_download_error_dialog" = "Nedlastningsfeil";
"common_check_internet_connection_dialog" = "Kontroller innstillingene dine og sørg for at enheten din er koblet til internett.";

2
iphone/Maps/nl.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Download de huidige kaart en verwijder de oude";
"migration_prefetch_status" = "Het voorbereiden van de update van de kaart…";
"migration_download_error_dialog" = "Downloadfout";
"common_check_internet_connection_dialog" = "Controleer je instellingen en zorg ervoor dat het apparaat is verbonden met het internet.";

2
iphone/Maps/pl.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Pobierz bieżącą mapę i usuń stare";
"migration_prefetch_status" = "Przygotowywanie aktualizacji map…";
"migration_download_error_dialog" = "Błąd pobierania";
"common_check_internet_connection_dialog" = "Sprawdź swoje ustawienia i upewnij się, że urządzenie ma połączenie z Internetem.";

2
iphone/Maps/pt.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Descarregue o mapa atual e elimine os antigos";
"migration_prefetch_status" = "A preparar a atualização de mapas…";
"migration_download_error_dialog" = "Erro de download";
"common_check_internet_connection_dialog" = "Por favor, verifique as suas opções e certifique-se de que o dispositivo está ligado à Internet.";

2
iphone/Maps/ro.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Descărcați harta actuală și ștergeți toate hărțile vechi";
"migration_prefetch_status" = "Pregătește actualizarea hărților…";
"migration_download_error_dialog" = "Eroare de descărcare";
"common_check_internet_connection_dialog" = "Vă rugăm să vă verificați setările și să vă asigurați că dispozitivul dvs. este conectat la Internet.";

2
iphone/Maps/ru.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Скачать текущую и удалить все старые карты";
"migration_prefetch_status" = "Подготовка обновления карт…";
"migration_download_error_dialog" = "Ошибка загрузки";
"common_check_internet_connection_dialog" = "Проверьте настройки и убедитесь, что устройство подключено к интернету.";

2
iphone/Maps/sk.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Stiahnite si aktuálnu mapu a odstráňte neaktuálne mapy";
"migration_prefetch_status" = "Prebieha príprava aktualizácie máp…";
"migration_download_error_dialog" = "Chyba pri sťahovaní";
"common_check_internet_connection_dialog" = "Prosím, skontrolujte svoje nastavenia a uistite sa, že váš počítač je pripojený k internetu.";

2
iphone/Maps/sv.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Ladda ned senaste kartan och radera de gamla";
"migration_prefetch_status" = "Förbereder kartuppdatering…";
"migration_download_error_dialog" = "Nedladdningsfel";
"common_check_internet_connection_dialog" = "Kontrollera dina inställningar och se till att din enhet är ansluten till internet.";

2
iphone/Maps/th.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "ดาวน์โหลดแผนที่ปัจจุบันและลบแผนที่เก่า";
"migration_prefetch_status" = "กำลังเตรียมการอัปเดตแผนที่…";
"migration_download_error_dialog" = "ข้อผิดพลาดในการดาวน์โหลด";
"common_check_internet_connection_dialog" = "กรุณาตรวจสอบการตั้งค่าของคุณแล้วทำให้แน่ใจว่าอุปกรณ์ของคุณได้รับการเชื่อมต่ออินเทอร์เน็ต";

2
iphone/Maps/tr.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Mevcut haritayı indir ve tüm eski haritaları sil";
"migration_prefetch_status" = "Harita güncellemesi hazırlanıyor…";
"migration_download_error_dialog" = "İndirme hatası";
"common_check_internet_connection_dialog" = "Lütfen ayarlarınızı kontrol edin ve cihazınızın internete bağlı olduğundan emin olun.";

2
iphone/Maps/uk.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Завантажте поточну карту і видаліть старі";
"migration_prefetch_status" = "Підготовка до оновлення карт…";
"migration_download_error_dialog" = "Помилка завантаження";
"common_check_internet_connection_dialog" = "Будь ласка, перевірте свої налаштування і переконайтеся, що ваш пристрій підлючено до Інтернету.";

2
iphone/Maps/vi.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "Tải xuống bản đồ hiện tại và xóa những bản đồ cũ";
"migration_prefetch_status" = "Đang chuẩn bị cập nhật các bản đồ…";
"migration_download_error_dialog" = "Lỗi tải xuống";
"common_check_internet_connection_dialog" = "Xin kiểm tra các thiết lập và đảm bảo thiết bị của bạn có kết nối Internet.";

2
iphone/Maps/zh-Hans.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "下载当前地图并删除旧地图";
"migration_prefetch_status" = "正在准备地图更新…";
"migration_download_error_dialog" = "下载错误";
"common_check_internet_connection_dialog" = "请检查您的设置并确保您的设备已连接至网络。";

2
iphone/Maps/zh-Hant.lproj/Localizable.strings
View file

@ -1275,8 +1275,6 @@
"migration_delete_all_download_current_button" = "下載當前地圖並刪除舊地圖";
"migration_prefetch_status" = "正在準備地圖更新…";
"migration_download_error_dialog" = "下載錯誤";
"common_check_internet_connection_dialog" = "請檢查您的設置並確保您的設備已連接至網絡。";

30
strings.txt
View file

@ -14740,36 +14740,6 @@
ja = 現在の地図をダウンロードして古い地図を削除
vi = Tải xuống bản đồ hiện tại và xóa những bản đồ cũ
[migration_prefetch_status]
tags = ios, android
en = Preparing maps update…
ru = Подготовка обновления карт…
tr = Harita güncellemesi hazırlanıyor…
sv = Förbereder kartuppdatering…
nb = Forbereder oppdatering av kart…
ko = 지도 업데이트 준비 중…
id = Mempersiapkan pembaruan peta…
hu = Térképfrissítések előkészítése…
de = Karten-Update wird vorbereitet …
fi = Karttojen päivitystä ladataan…
nl = Het voorbereiden van de update van de kaart…
da = Forbereder kortopdatering…
cs = Probíhá příprava na aktualizace map…
zh-Hans = 正在准备地图更新…
zh-Hant = 正在準備地圖更新…
ar = جار الإعداد لتحديث الخرائط…
th = กำลังเตรียมการอัปเดตแผนที่…
uk = Підготовка до оновлення карт…
pt = A preparar a atualização de mapas…
es = Preparando la actualización de mapas…
ro = Pregătește actualizarea hărților…
pl = Przygotowywanie aktualizacji map…
sk = Prebieha príprava aktualizácie máp…
it = Preparazione aggiornamento delle mappe…
fr = Préparation de la mise à jour des cartes…
ja = 地図のアップデートの準備中…
vi = Đang chuẩn bị cập nhật các bản đồ…
[migration_download_error_dialog]
tags = ios, android
en = Download error