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

[android] Delete country before update downloading. We can't share mwm file between map and downloader.

Browse source
This commit is contained in:
vng 2012-06-20 20:59:53 -07:00 • committed by Alex Zolotarev
parent e6fe712ebe
commit 345059e2e9
5 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,5 +47,5 @@
<string formatted="false" name="country_status_downloading">Загружается%(%\\%)</string>
<string name="country_status_download_failed">Ошибка загрузки%.</string>
<string name="downloaded_touch_to_update">Загружено (%s), нажмите для обновления</string>
<string name="update">Обновить</string>
<string name="update_mb_or_kb">Обновить %s</string>
</resources>

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

@ -52,5 +52,5 @@
<string name="pro_version_available">Pro version of MapsWithMe featuring offline search is available for purchase.</string>
<string name="later">Later</string>
<string name="downloaded_touch_to_update">Downloaded (%s), touch to update</string>
<string name="update">Update</string>
<string name="update_mb_or_kb">Update %s</string>
</resources>

3
android/src/com/mapswithme/maps/DownloadResourcesActivity.java
View file

@ -210,10 +210,13 @@ public class DownloadResourcesActivity extends Activity implements LocationServi
if (idx.isValid())
{
mMapStorage.deleteCountry(idx);
mProgress.setMax((int)mMapStorage.countryRemoteSizeInBytes(idx));
mProgress.setProgress(0);
mMapStorage.downloadCountry(idx);
mProceedButton.setVisibility(View.VISIBLE);
mPauseButton.setVisibility(View.GONE);
}

15
android/src/com/mapswithme/maps/DownloadUI.java
View file

@ -141,7 +141,6 @@ public class DownloadUI extends ListActivity implements MapStorage.Listener
m_mb = context.getString(R.string.mb);
m_alert = new AlertDialog.Builder(m_context);
m_alert.setCancelable(true);
fillList();
}
@ -202,7 +201,7 @@ public class DownloadUI extends ListActivity implements MapStorage.Listener
.show();
}
private long getFreeSpace()
static private long getFreeSpace()
{
StatFs stat = new StatFs(Environment.getExternalStorageDirectory().getPath());
return (long)stat.getAvailableBlocks() * (long)stat.getBlockSize();
@ -236,19 +235,25 @@ public class DownloadUI extends ListActivity implements MapStorage.Listener
break;
case MapStorage.ON_DISK_OUT_OF_DATE:
final long remoteSize = m_storage.countryRemoteSizeInBytes(idx);
// Update or delete
m_alert
new AlertDialog.Builder(m_context)
.setTitle(name)
.setPositiveButton(R.string.update, new DialogInterface.OnClickListener()
.setPositiveButton(m_context.getString(R.string.update_mb_or_kb, getSizeString(remoteSize)),
new DialogInterface.OnClickListener()
{
@Override
public void onClick(DialogInterface dlg, int which)
{
final long size = m_storage.countryRemoteSizeInBytes(idx);
final long size = remoteSize - m_storage.countryLocalSizeInBytes(idx);
if (size > getFreeSpace())
showNotEnoughFreeSpaceDialog(getSizeString(size), name);
else
{
m_storage.deleteCountry(idx);
m_storage.downloadCountry(idx);
}
dlg.dismiss();
}

4
platform/http_request.cpp
View file

@ -190,10 +190,10 @@ class FileHttpRequest : public HttpRequest, public IHttpThreadCallback
// clean up resume file with chunks range on success
if (m_status == ECompleted)
{
my::DeleteFileX(m_filePath + RESUME_FILE_EXTENSION);
(void)my::DeleteFileX(m_filePath + RESUME_FILE_EXTENSION);
// Rename finished file to it's original name.
my::DeleteFileX(m_filePath);
(void)my::DeleteFileX(m_filePath);
CHECK(my::RenameFileX(m_filePath + DOWNLOADING_FILE_EXTENSION, m_filePath), ());
DisableBackupForFile(m_filePath);