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

[iOS] Fixed crash in subscriptions restor from settings

Browse source
This commit is contained in:
Alexander Boriskov 2020-04-17 21:03:56 +03:00 • committed by Aleksey Belousov
parent 2df9f7e50f
commit 3141f335c9
1 changed files with 5 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
iphone/Maps/UI/Settings/MWMSettingsViewController.mm
View file

@ -431,55 +431,26 @@ using namespace power_management;
#pragma mark - RestoreSubscription
- (void)restoreSubscription {
dispatch_group_t dispatchGroup = dispatch_group_create();
[self.restoreSubscriptionCell.progress startAnimating];
self.restoringSubscription = YES;
__block MWMValidationResult adsResult;
__block MWMValidationResult bookmarksResult;
__block MWMValidationResult allPassResult;
dispatch_group_enter(dispatchGroup);
[[InAppPurchase adsRemovalSubscriptionManager] restore:^(MWMValidationResult result) {
adsResult = result;
[[InAppPurchase adsRemovalSubscriptionManager] setSubscriptionActive: result == MWMValidationResultValid];
dispatch_group_leave(dispatchGroup);
}];
dispatch_group_enter(dispatchGroup);
[[InAppPurchase bookmarksSubscriptionManager] restore:^(MWMValidationResult result) {
bookmarksResult = result;
[[InAppPurchase bookmarksSubscriptionManager] setSubscriptionActive: result == MWMValidationResultValid];
dispatch_group_leave(dispatchGroup);
}];
dispatch_group_enter(dispatchGroup);
[[InAppPurchase allPassSubscriptionManager] restore:^(MWMValidationResult result) {
allPassResult = result;
[[InAppPurchase allPassSubscriptionManager] setSubscriptionActive: result == MWMValidationResultValid];
dispatch_group_leave(dispatchGroup);
}];
__weak auto s = self;
dispatch_group_notify(dispatchGroup, dispatch_get_main_queue(), ^{
[[InAppPurchase adsRemovalSubscriptionManager] restore:^(MWMValidationResult result) {
__strong auto self = s;
self.restoringSubscription = NO;
[self.restoreSubscriptionCell.progress stopAnimating];
NSString *alertText;
if (adsResult == MWMValidationResultNotValid &&
bookmarksResult == MWMValidationResultNotValid &&
allPassResult == MWMValidationResultNotValid) {
[[InAppPurchase adsRemovalSubscriptionManager] setSubscriptionActive: result == MWMValidationResultValid];
if (result == MWMValidationResultNotValid) {
alertText = L(@"restore_no_subscription_alert");
} else if (adsResult == MWMValidationResultValid ||
bookmarksResult == MWMValidationResultValid ||
allPassResult == MWMValidationResultValid) {
} else if (result == MWMValidationResultValid) {
alertText = L(@"restore_success_alert");
} else {
alertText = L(@"restore_error_alert");
}
[MWMAlertViewController.activeAlertController presentInfoAlert:L(@"restore_subscription")
text:alertText];
});
}];
}
@end