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

[MAPSME-1200] [ios] Fixed retry download.

Browse source
This commit is contained in:
Ilya Grechuhin 2016-11-15 16:58:32 +03:00
parent 71e7508675
commit 54828b8da6
8 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,12 +14,13 @@ static CGFloat const kDividerTopConstant = -8.;
@interface MWMDefaultAlert ()
@property (weak, nonatomic) IBOutlet UILabel * messageLabel;
@property (weak, nonatomic) IBOutlet UIButton * rightButton;
@property (weak, nonatomic) IBOutlet UIButton * leftButton;
@property (weak, nonatomic) IBOutlet UILabel * titleLabel;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * rightButtonWidth;
@property (copy, nonatomic) TMWMVoidBlock leftButtonAction;
@property(weak, nonatomic) IBOutlet UILabel * messageLabel;
@property(weak, nonatomic) IBOutlet UIButton * rightButton;
@property(weak, nonatomic) IBOutlet UIButton * leftButton;
@property(weak, nonatomic) IBOutlet UILabel * titleLabel;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * rightButtonWidth;
@property(copy, nonatomic) TMWMVoidBlock leftButtonAction;
@property(copy, nonatomic, readwrite) TMWMVoidBlock rightButtonAction;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * dividerTop;
@property(copy, nonatomic) NSString * statisticsEvent;

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

@ -9,6 +9,6 @@
rightButtonAction:(nullable TMWMVoidBlock)action
statisticsEvent:(nonnull NSString *)statisticsEvent;
@property(copy, nonatomic, nullable) TMWMVoidBlock rightButtonAction;
@property(copy, nonatomic, readonly, nullable) TMWMVoidBlock rightButtonAction;
@end

2
iphone/Maps/Classes/MWMBasePlacePageView.mm
View file

@ -769,7 +769,7 @@ using namespace storage;
[MWMStorage downloadNode:countryId alertController:avc onSuccess:nil];
break;
case NodeStatus::Undefined:
case NodeStatus::Error: [MWMStorage retryDownloadNode:countryId]; break;
case NodeStatus::Error: [MWMStorage retryDownloadNode:countryId alertController:avc]; break;
case NodeStatus::OnDiskOutOfDate: [MWMStorage updateNode:countryId alertController:avc]; break;
case NodeStatus::Downloading:
case NodeStatus::InQueue: [MWMStorage cancelDownloadNode:countryId]; break;

2
iphone/Maps/Classes/MWMPlacePageManager.mm
View file

@ -76,7 +76,7 @@
case NodeStatus::NotDownloaded:
case NodeStatus::Partly: [MWMStorage downloadNode:countryId alertController:avc onSuccess:nil]; break;
case NodeStatus::Undefined:
case NodeStatus::Error: [MWMStorage retryDownloadNode:countryId]; break;
case NodeStatus::Error: [MWMStorage retryDownloadNode:countryId alertController:avc]; break;
case NodeStatus::OnDiskOutOfDate: [MWMStorage updateNode:countryId alertController:avc]; break;
case NodeStatus::Downloading:
case NodeStatus::InQueue: [MWMStorage cancelDownloadNode:countryId]; break;

2
iphone/Maps/Classes/MapDownloader/MWMBaseMapDownloaderViewController.mm
View file

@ -673,7 +673,7 @@ using namespace mwm;
kStatScenario : kStatDownload
}];
self.skipCountryEventProcessing = YES;
[MWMStorage retryDownloadNode:countryId];
[MWMStorage retryDownloadNode:countryId alertController:self.alertController];
self.skipCountryEventProcessing = NO;
[self processCountryEvent:countryId];
}

3
iphone/Maps/Classes/Storage/MWMStorage.h
View file

@ -5,7 +5,8 @@
@interface MWMStorage : NSObject
+ (void)downloadNode:(storage::TCountryId const &)countryId alertController:(MWMAlertViewController *)alertController onSuccess:(TMWMVoidBlock)onSuccess;
+ (void)retryDownloadNode:(storage::TCountryId const &)countryId;
+ (void)retryDownloadNode:(storage::TCountryId const &)countryId
alertController:(MWMAlertViewController *)alertController;
+ (void)updateNode:(storage::TCountryId const &)countryId alertController:(MWMAlertViewController *)alertController;
+ (void)deleteNode:(storage::TCountryId const &)countryId alertController:(MWMAlertViewController *)alertController;
+ (void)cancelDownloadNode:(storage::TCountryId const &)countryId;

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

@ -31,8 +31,12 @@ using namespace storage;
}
+ (void)retryDownloadNode:(TCountryId const &)countryId
alertController:(MWMAlertViewController *)alertController
{
GetFramework().GetStorage().RetryDownloadNode(countryId);
[self checkConnectionAndPerformAction:[countryId] {
GetFramework().GetStorage().RetryDownloadNode(countryId);
}
alertController:alertController];
}
+ (void)updateNode:(TCountryId const &)countryId

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

@ -203,7 +203,8 @@ using namespace storage;
kStatScenario : kStatDownload
}];
[self showInQueue];
[MWMStorage retryDownloadNode:self->m_countryId];
[MWMStorage retryDownloadNode:self->m_countryId
alertController:self.controller.alertController];
};
auto const cancelBlock = ^{
[Statistics logEvent:kStatDownloaderDownloadCancel withParameters:@{kStatFrom : kStatMap}];
@ -292,7 +293,7 @@ using namespace storage;
kStatScenario : kStatDownload
}];
[self showInQueue];
[MWMStorage retryDownloadNode:m_countryId];
[MWMStorage retryDownloadNode:m_countryId alertController:self.controller.alertController];
}
else
{