kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[ios] Fixed space check for update maps action.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-04-26 18:21:52 +03:00
parent fbb49c05ae
commit cb4d35342f
1 changed files with 27 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
iphone/Maps/Classes/Storage/MWMStorage.mm
View file

@ -23,14 +23,23 @@ using namespace storage;
[ud synchronize];
}
+ (void)downloadNode:(TCountryId const &)countryId alertController:(MWMAlertViewController *)alertController onSuccess:(TMWMVoidBlock)onSuccess
+ (void)downloadNode:(TCountryId const &)countryId
alertController:(MWMAlertViewController *)alertController
onSuccess:(TMWMVoidBlock)onSuccess
{
[self checkEnoughSpaceFor:countryId andPerformAction:[countryId, onSuccess]
if (IsEnoughSpaceForDownload(countryId, GetFramework().Storage()))
{
GetFramework().Storage().DownloadNode(countryId);
if (onSuccess)
onSuccess();
} alertController:alertController];
[self checkConnectionAndPerformAction:[countryId, onSuccess]
{
GetFramework().Storage().DownloadNode(countryId);
if (onSuccess)
onSuccess();
} alertController:alertController];
}
else
{
[alertController presentNotEnoughSpaceAlert];
}
}
+ (void)retryDownloadNode:(TCountryId const &)countryId
@ -38,12 +47,20 @@ using namespace storage;
GetFramework().Storage().RetryDownloadNode(countryId);
}
+ (void)updateNode:(TCountryId const &)countryId alertController:(MWMAlertViewController *)alertController
+ (void)updateNode:(TCountryId const &)countryId
alertController:(MWMAlertViewController *)alertController
{
[self checkEnoughSpaceFor:countryId andPerformAction:[countryId]
if (IsEnoughSpaceForUpdate(countryId, GetFramework().Storage()))
{
GetFramework().Storage().UpdateNode(countryId);
} alertController:alertController];
[self checkConnectionAndPerformAction:[countryId]
{
GetFramework().Storage().UpdateNode(countryId);
} alertController:alertController];
}
else
{
[alertController presentNotEnoughSpaceAlert];
}
}
+ (void)deleteNode:(TCountryId const &)countryId alertController:(MWMAlertViewController *)alertController
@ -99,16 +116,6 @@ using namespace storage;
}
}
+ (void)checkEnoughSpaceFor:(TCountryId const &)countryId
andPerformAction:(TMWMVoidBlock)action
alertController:(MWMAlertViewController *)alertController
{
if (IsEnoughSpaceForDownload(countryId, GetFramework().Storage()))
[self checkConnectionAndPerformAction:action alertController:alertController];
else
[alertController presentNotEnoughSpaceAlert];
}
+ (void)checkConnectionAndPerformAction:(TMWMVoidBlock)action
alertController:(MWMAlertViewController *)alertController
{