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

[iOS] new onCancel callback for MWMStorage download/update actions

Browse source
This commit is contained in:
Zoia Pribytkova 2019-04-24 18:35:43 +03:00 • committed by Arsentiy Milchakov
parent 972b159b3e
commit 6720301084
16 changed files with 57 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.h
View file

@ -21,7 +21,7 @@
- (void)presentMigrationProhibitedAlert;
- (void)presentDeleteMapProhibitedAlert;
- (void)presentUnsavedEditsAlertWithOkBlock:(nonnull MWMVoidBlock)okBlock;
- (void)presentNoWiFiAlertWithOkBlock:(nullable MWMVoidBlock)okBlock;
- (void)presentNoWiFiAlertWithOkBlock:(nullable MWMVoidBlock)okBlock andCancelBlock:(nullable MWMVoidBlock)cancelBlock;
- (void)presentIncorrectFeauturePositionAlert;
- (void)presentInternalErrorAlert;
- (void)presentNotEnoughSpaceAlert;

4
iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm
View file

@ -80,9 +80,9 @@ static NSString * const kAlertControllerNibIdentifier = @"MWMAlertViewController
[self displayAlert:[MWMAlert unsavedEditsAlertWithOkBlock:okBlock]];
}
- (void)presentNoWiFiAlertWithOkBlock:(nullable MWMVoidBlock)okBlock
- (void)presentNoWiFiAlertWithOkBlock:(nullable MWMVoidBlock)okBlock andCancelBlock:(MWMVoidBlock)cancelBlock
{
[self displayAlert:[MWMAlert noWiFiAlertWithOkBlock:okBlock]];
[self displayAlert:[MWMAlert noWiFiAlertWithOkBlock:okBlock andCancelBlock:cancelBlock]];
}
- (void)presentIncorrectFeauturePositionAlert

2
iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.h
View file

@ -8,7 +8,7 @@
+ (MWMAlert *)locationAlert;
+ (MWMAlert *)routingDisclaimerAlertWithOkBlock:(MWMVoidBlock)block;
+ (MWMAlert *)disabledLocationAlert;
+ (MWMAlert *)noWiFiAlertWithOkBlock:(MWMVoidBlock)okBlock;
+ (MWMAlert *)noWiFiAlertWithOkBlock:(MWMVoidBlock)okBlock andCancelBlock:(MWMVoidBlock)cancelBlock;
+ (MWMAlert *)noConnectionAlert;
+ (MWMAlert *)migrationProhibitedAlert;
+ (MWMAlert *)deleteMapProhibitedAlert;

4
iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm
View file

@ -27,9 +27,9 @@
}
+ (MWMAlert *)disabledLocationAlert { return [MWMDefaultAlert disabledLocationAlert]; }
+ (MWMAlert *)noWiFiAlertWithOkBlock:(MWMVoidBlock)okBlock
+ (MWMAlert *)noWiFiAlertWithOkBlock:(MWMVoidBlock)okBlock andCancelBlock:(MWMVoidBlock)cancelBlock
{
return [MWMDefaultAlert noWiFiAlertWithOkBlock:okBlock];
return [MWMDefaultAlert noWiFiAlertWithOkBlock:okBlock andCancelBlock:cancelBlock];
}
+ (MWMAlert *)noConnectionAlert { return [MWMDefaultAlert noConnectionAlert]; }

2
iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.h
View file

@ -17,7 +17,7 @@
+ (instancetype)noCurrentPositionAlert;
+ (instancetype)pointsInDifferentMWMAlert;
+ (instancetype)disabledLocationAlert;
+ (instancetype)noWiFiAlertWithOkBlock:(MWMVoidBlock)okBlock;
+ (instancetype)noWiFiAlertWithOkBlock:(MWMVoidBlock)okBlock andCancelBlock:(MWMVoidBlock)cancelBlock;
+ (instancetype)noConnectionAlert;
+ (instancetype)migrationProhibitedAlert;
+ (instancetype)deleteMapProhibitedAlert;

3
iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm
View file

@ -123,7 +123,7 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert";
statisticsEvent:@"Editor unsaved changes on delete"];
}
+ (instancetype)noWiFiAlertWithOkBlock:(MWMVoidBlock)okBlock
+ (instancetype)noWiFiAlertWithOkBlock:(MWMVoidBlock)okBlock andCancelBlock:(MWMVoidBlock)cancelBlock
{
MWMDefaultAlert * alert = [self defaultAlertWithTitle:L(@"download_over_mobile_header")
message:L(@"download_over_mobile_message")
@ -131,6 +131,7 @@ static NSString * const kDefaultAlertNibName = @"MWMDefaultAlert";
leftButtonTitle:L(@"cancel")
rightButtonAction:okBlock
statisticsEvent:@"No WiFi Alert"];
alert.leftButtonAction = cancelBlock;
[alert setNeedsCloseAlertAfterEnterBackground];
return alert;
}

4
iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm
View file

@ -154,7 +154,7 @@ using namespace storage;
[MWMStorage downloadNode:m_countryId
onSuccess:^{
[self showInQueue];
}];
} onCancel:nil];
}
else
{
@ -383,7 +383,7 @@ using namespace storage;
[MWMStorage downloadNode:m_countryId
onSuccess:^{
[self showInQueue];
}];
} onCancel:nil];
}
}

2
iphone/Maps/Core/Framework/MWMFrameworkHelper.h
View file

@ -8,7 +8,7 @@
+ (MWMDayTime)daytime;
+ (void)checkConnectionAndPerformAction:(MWMVoidBlock)action;
+ (void)checkConnectionAndPerformAction:(MWMVoidBlock)action cancelAction:(MWMVoidBlock)cancel;
+ (void)createFramework;

6
iphone/Maps/Core/Framework/MWMFrameworkHelper.mm
View file

@ -67,12 +67,14 @@
}
}
+ (void)checkConnectionAndPerformAction:(MWMVoidBlock)action
+ (void)checkConnectionAndPerformAction:(MWMVoidBlock)action cancelAction:(MWMVoidBlock)cancel
{
switch (Platform::ConnectionStatus())
{
case Platform::EConnectionType::CONNECTION_NONE:
[[MWMAlertViewController activeAlertController] presentNoConnectionAlert];
if (cancel)
cancel();
break;
case Platform::EConnectionType::CONNECTION_WIFI:
action();
@ -84,7 +86,7 @@
[[MWMAlertViewController activeAlertController] presentNoWiFiAlertWithOkBlock:[action] {
GetFramework().GetDownloadingPolicy().EnableCellularDownload(true);
action();
}];
} andCancelBlock:cancel];
}
else
{

3
iphone/Maps/Core/Routing/MWMRouter.mm
View file

@ -725,7 +725,8 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
}
downloadBlock:^(storage::CountriesVec const & downloadCountries, MWMVoidBlock onSuccess) {
[MWMStorage downloadNodes:downloadCountries
onSuccess:onSuccess];
onSuccess:onSuccess
onCancel:nil];
}
downloadCompleteBlock:^{
[MWMRouter rebuildWithBestRouter:NO];

11
iphone/Maps/Core/Storage/MWMStorage.h
View file

@ -2,13 +2,18 @@
@interface MWMStorage : NSObject
+ (void)downloadNode:(storage::CountryId const &)countryId onSuccess:(MWMVoidBlock)onSuccess;
+ (void)downloadNode:(storage::CountryId const &)countryId
onSuccess:(MWMVoidBlock)onSuccess
onCancel:(MWMVoidBlock)onCancel;
+ (void)retryDownloadNode:(storage::CountryId const &)countryId;
+ (void)updateNode:(storage::CountryId const &)countryId;
+ (void)updateNode:(storage::CountryId const &)countryId
onCancel:(MWMVoidBlock)onCancel;
+ (void)deleteNode:(storage::CountryId const &)countryId;
+ (void)cancelDownloadNode:(storage::CountryId const &)countryId;
+ (void)showNode:(storage::CountryId const &)countryId;
+ (void)downloadNodes:(storage::CountriesVec const &)countryIds onSuccess:(MWMVoidBlock)onSuccess;
+ (void)downloadNodes:(storage::CountriesVec const &)countryIds
onSuccess:(MWMVoidBlock)onSuccess
onCancel:(MWMVoidBlock)onCancel;
@end

20
iphone/Maps/Core/Storage/MWMStorage.mm
View file

@ -13,7 +13,7 @@ using namespace storage;
@implementation MWMStorage
+ (void)downloadNode:(CountryId const &)countryId onSuccess:(MWMVoidBlock)onSuccess
+ (void)downloadNode:(CountryId const &)countryId onSuccess:(MWMVoidBlock)onSuccess onCancel:(MWMVoidBlock)onCancel
{
if (IsEnoughSpaceForDownload(countryId, GetFramework().GetStorage()))
{
@ -21,11 +21,13 @@ using namespace storage;
GetFramework().GetStorage().DownloadNode(countryId);
if (onSuccess)
onSuccess();
}];
} cancelAction:onCancel];
}
else
{
[[MWMAlertViewController activeAlertController] presentNotEnoughSpaceAlert];
if (onCancel)
onCancel();
}
}
@ -33,20 +35,22 @@ using namespace storage;
{
[MWMFrameworkHelper checkConnectionAndPerformAction:[countryId] {
GetFramework().GetStorage().RetryDownloadNode(countryId);
}];
} cancelAction:nil];
}
+ (void)updateNode:(CountryId const &)countryId
+ (void)updateNode:(CountryId const &)countryId onCancel:(MWMVoidBlock)onCancel
{
if (IsEnoughSpaceForUpdate(countryId, GetFramework().GetStorage()))
{
[MWMFrameworkHelper checkConnectionAndPerformAction:[countryId] {
GetFramework().GetStorage().UpdateNode(countryId);
}];
} cancelAction:onCancel];
}
else
{
[[MWMAlertViewController activeAlertController] presentNotEnoughSpaceAlert];
if (onCancel)
onCancel();
}
}
@ -78,7 +82,7 @@ using namespace storage;
}
+ (void)showNode:(CountryId const &)countryId { GetFramework().ShowNode(countryId); }
+ (void)downloadNodes:(CountriesVec const &)countryIds onSuccess:(MWMVoidBlock)onSuccess
+ (void)downloadNodes:(CountriesVec const &)countryIds onSuccess:(MWMVoidBlock)onSuccess onCancel:(MWMVoidBlock)onCancel
{
auto & s = GetFramework().GetStorage();
MwmSize requiredSize =
@ -95,11 +99,13 @@ using namespace storage;
s.DownloadNode(countryId);
if (onSuccess)
onSuccess();
}];
} cancelAction: onCancel];
}
else
{
[[MWMAlertViewController activeAlertController] presentNotEnoughSpaceAlert];
if (onCancel)
onCancel();
}
}

13
iphone/Maps/UI/Autoupdate/MWMAutoupdateController.mm
View file

@ -172,11 +172,13 @@ enum class State
self.progressFinished = NO;
[Statistics logEvent:kStatDownloaderOnStartScreenShow
withParameters:@{kStatMapDataSize : @(self.sizeInMB)}];
auto view = static_cast<MWMAutoupdateView *>(self.view);
MWMAutoupdateView *view = (MWMAutoupdateView *)self.view;
if (self.todo == Framework::DoAfterUpdate::AutoupdateMaps)
{
[view stateDownloading];
[MWMStorage updateNode:RootId()];
[MWMStorage updateNode:RootId() onCancel:^{
[view stateWaiting];
}];
[Statistics logEvent:kStatDownloaderOnStartScreenAutoDownload
withParameters:@{kStatMapDataSize : @(self.sizeInMB)}];
}
@ -196,8 +198,11 @@ enum class State
- (IBAction)updateTap
{
[static_cast<MWMAutoupdateView *>(self.view) stateDownloading];
[MWMStorage updateNode:RootId()];
MWMAutoupdateView *view = (MWMAutoupdateView *)self.view;
[view stateDownloading];
[MWMStorage updateNode:RootId() onCancel:^{
[view stateWaiting];
}];
[Statistics logEvent:kStatDownloaderOnStartScreenManualDownload
withParameters:@{kStatMapDataSize : @(self.sizeInMB)}];
}

10
iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm
View file

@ -350,7 +350,8 @@ using namespace storage;
kStatFrom: kStatDownloader,
kStatScenario: kStatUpdateAll
}];
[MWMStorage updateNode:parentCountryId];
[MWMStorage updateNode:parentCountryId
onCancel:nil];
}
else
{
@ -362,7 +363,8 @@ using namespace storage;
kStatScenario : kStatDownloadGroup
}];
[MWMStorage downloadNode:parentCountryId
onSuccess:nil];
onSuccess:nil
onCancel:nil];
}
self.skipCountryEventProcessing = NO;
[self processCountryEvent:parentCountryId];
@ -636,7 +638,7 @@ using namespace storage;
kStatScenario: kStatDownload
}];
self.skipCountryEventProcessing = YES;
[MWMStorage downloadNode:countryId onSuccess:nil];
[MWMStorage downloadNode:countryId onSuccess:nil onCancel:nil];
self.skipCountryEventProcessing = NO;
[self processCountryEvent:countryId];
}
@ -666,7 +668,7 @@ using namespace storage;
kStatScenario: kStatUpdate
}];
self.skipCountryEventProcessing = YES;
[MWMStorage updateNode:countryId];
[MWMStorage updateNode:countryId onCancel:nil];
self.skipCountryEventProcessing = NO;
[self processCountryEvent:countryId];
}

2
iphone/Maps/UI/Migration/MWMMigrationViewController.mm
View file

@ -96,7 +96,7 @@ using namespace storage;
[self setState:MWMMigrationViewState::Processing];
else
migrate();
}];
} cancelAction:nil];
}
- (void)showError:(NodeErrorCode)errorCode countryId:(CountryId const &)countryId

4
iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm
View file

@ -167,10 +167,10 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page:
switch (nodeAttrs.m_status)
{
case NodeStatus::NotDownloaded:
case NodeStatus::Partly: [MWMStorage downloadNode:countryId onSuccess:nil]; break;
case NodeStatus::Partly: [MWMStorage downloadNode:countryId onSuccess:nil onCancel:nil]; break;
case NodeStatus::Undefined:
case NodeStatus::Error: [MWMStorage retryDownloadNode:countryId]; break;
case NodeStatus::OnDiskOutOfDate: [MWMStorage updateNode:countryId]; break;
case NodeStatus::OnDiskOutOfDate: [MWMStorage updateNode:countryId onCancel:nil]; break;
case NodeStatus::Downloading:
case NodeStatus::Applying:
case NodeStatus::InQueue: [MWMStorage cancelDownloadNode:countryId]; break;