[ios] bug fix

This commit is contained in:
ExMix 2014-10-27 15:37:00 +03:00 committed by Alex Zolotarev
parent 8adfd97d66
commit 821cfa62cb
4 changed files with 10 additions and 10 deletions

View file

@ -146,14 +146,14 @@
return self.mapsLayout.GetCountryOptions(self.selectedGroup, self.selectedPosition);
}
- (void)performAction:(DownloaderAction)action
- (void)performAction:(DownloaderAction)action withSizeCheck:(BOOL)check
{
switch (action)
{
case DownloaderActionDownloadAll:
case DownloaderActionDownloadMap:
case DownloaderActionDownloadCarRouting:
if ([self canDownloadSelectedMap])
if (check == NO || [self canDownloadSelectedMap])
self.mapsLayout.DownloadMap(self.selectedGroup, self.selectedPosition, self.selectedInActionSheetOptions);
break;

View file

@ -153,14 +153,14 @@
return self.tree.GetLeafOptions(self.selectedPosition);
}
- (void)performAction:(DownloaderAction)action
- (void)performAction:(DownloaderAction)action withSizeCheck:(BOOL)check
{
switch (action)
{
case DownloaderActionDownloadAll:
case DownloaderActionDownloadMap:
case DownloaderActionDownloadCarRouting:
if ([self canDownloadSelectedMap])
if (check == NO || [self canDownloadSelectedMap])
self.tree.DownloadCountry(self.selectedPosition, self.selectedInActionSheetOptions);
break;

View file

@ -46,6 +46,6 @@ using namespace storage;
- (size_t)selectedMapSizeWithOptions:(TMapOptions)options;
- (TStatus)selectedMapStatus;
- (TMapOptions)selectedMapOptions;
- (void)performAction:(DownloaderAction)action;
- (void)performAction:(DownloaderAction)action withSizeCheck:(BOOL)check;
@end

View file

@ -39,11 +39,11 @@
if (buttonIndex != alertView.cancelButtonIndex)
{
if (self.selectedInActionSheetOptions == TMapOptions::EMapOnly)
[self performAction:DownloaderActionDownloadMap];
[self performAction:DownloaderActionDownloadMap withSizeCheck:NO];
else if (self.selectedInActionSheetOptions == TMapOptions::ECarRouting)
[self performAction:DownloaderActionDownloadCarRouting];
[self performAction:DownloaderActionDownloadCarRouting withSizeCheck:NO];
else if (self.selectedInActionSheetOptions == TMapOptions::EMapWithCarRouting)
[self performAction:DownloaderActionDownloadAll];
[self performAction:DownloaderActionDownloadAll withSizeCheck:NO];
}
}
@ -54,7 +54,7 @@
#pragma mark - Virtual methods
- (void)performAction:(DownloaderAction)action {}
- (void)performAction:(DownloaderAction)action withSizeCheck:(BOOL)check {}
- (NSString *)parentTitle { return nil; }
- (NSString *)selectedMapName { return nil; }
- (NSString *)selectedMapGuideName { return nil; }
@ -265,7 +265,7 @@
break;
}
[self performAction:action];
[self performAction:action withSizeCheck:YES];
}
}