[iOS] show "expired subscription dialog" when appropriate

https://jira.mail.ru/browse/MAPSME-11576
2019-08-30 17:57:26 +03:00 · 2019-08-30 17:57:26 +03:00 · 1d1037e04e
commit 1d1037e04e
parent fbce7107c2
15 changed files with 118 additions and 31 deletions
--- a/iphone/Maps/Bookmarks/Catalog/BookmarksSubscriptionViewController.swift
+++ b/iphone/Maps/Bookmarks/Catalog/BookmarksSubscriptionViewController.swift
@ -223,8 +223,9 @@ extension BookmarksSubscriptionViewController: SubscriptionManagerListener {
                                                          text: L("purchase_error_subtitle"))
  }

-  func didSubsribe(_ subscription: ISubscription) {
+  func didSubscribe(_ subscription: ISubscription) {
    MWMPurchaseManager.setBookmarksSubscriptionActive(true)
+    MWMBookmarksManager.shared().resetInvalidCategories()
  }

  func didDefer(_ subscription: ISubscription) {
--- a/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
+++ b/iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
@ -152,7 +152,10 @@ final class CatalogWebViewController: WebViewController {

  override func willLoadUrl(_ decisionHandler: @escaping (Bool, Dictionary<String, String>?) -> Void) {
    buildHeaders { [weak self] (headers) in
-      self?.handlePendingTransactions { decisionHandler($0, headers) }
+      self?.handlePendingTransactions {
+        decisionHandler($0, headers)
+        self?.checkInvalidSubscription()
+      }
    }
  }

--- a/iphone/Maps/Bookmarks/Catalog/Dialogs/BookmarksSubscriptionExpiredViewController.swift
+++ b/iphone/Maps/Bookmarks/Catalog/Dialogs/BookmarksSubscriptionExpiredViewController.swift
@ -1,5 +1,5 @@
 class BookmarksSubscriptionExpiredViewController: UIViewController {
-  private let transitioning = FadeTransitioning<AlertPresentationController>()
+  private let transitioning = FadeTransitioning<AlertPresentationController>(cancellable: false)
  private let onSubscribe: MWMVoidBlock
  private let onDelete: MWMVoidBlock

--- a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift
+++ b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift
@ -30,6 +30,7 @@ class DownloadedBookmarksViewController: MWMViewController {
    tableView.tableHeaderView = bottomView
    tableView.registerNib(cell: CatalogCategoryCell.self)
    tableView.registerNibForHeaderFooterView(BMCCategoriesHeader.self)
+    checkInvalidSubscription()
    if #available(iOS 11, *) { return } // workaround for https://jira.mail.ru/browse/MAPSME-8101
    reloadData()
  }
--- a/iphone/Maps/Bookmarks/Catalog/PaidRouteViewController.swift
+++ b/iphone/Maps/Bookmarks/Catalog/PaidRouteViewController.swift
@ -237,8 +237,9 @@ extension PaidRouteViewController : SubscriptionManagerListener {
                                                          text: L("purchase_error_subtitle"))
  }

-  func didSubsribe(_ subscription: ISubscription) {
+  func didSubscribe(_ subscription: ISubscription) {
    MWMPurchaseManager.setBookmarksSubscriptionActive(true)
+    MWMBookmarksManager.shared().resetInvalidCategories()
  }

  func didDefer(_ subscription: ISubscription) {
--- a/iphone/Maps/Bookmarks/Catalog/UIViewController+Subscription.swift
+++ b/iphone/Maps/Bookmarks/Catalog/UIViewController+Subscription.swift
@ -0,0 +1,30 @@
+extension UIViewController {
+  func checkInvalidSubscription() {
+    MWMBookmarksManager.shared().check { [weak self] hasInvalidSubscription in
+      guard hasInvalidSubscription else {
+        return
+      }
+
+      let onSubscribe = {
+        self?.dismiss(animated: true)
+        let subscriptionDialog = BookmarksSubscriptionViewController()
+        subscriptionDialog.onSubscribe = { [weak self] in
+          self?.dismiss(animated: true)
+        }
+        subscriptionDialog.onCancel = { [weak self] in
+          self?.dismiss(animated: true) {
+            self?.checkInvalidSubscription()
+          }
+        }
+        self?.present(subscriptionDialog, animated: true)
+      }
+      let onDelete = {
+        self?.dismiss(animated: true)
+        MWMBookmarksManager.shared().deleteInvalidCategories()
+      }
+      let subscriptionExpiredDialog = BookmarksSubscriptionExpiredViewController(onSubscribe: onSubscribe, onDelete: onDelete)
+      self?.present(subscriptionExpiredDialog, animated: true)
+    }
+  }
+}
+
--- a/iphone/Maps/Classes/Components/Modal/CoverVerticalModalTransitioning.swift
+++ b/iphone/Maps/Classes/Components/Modal/CoverVerticalModalTransitioning.swift
@ -27,7 +27,11 @@ fileprivate final class PresentationController: DimmedModalPresentationControlle
    height = presentationHeight
    super.init(presentedViewController: presentedViewController, presenting: presentingViewController)
  }
-
+  
+  required init(presentedViewController: UIViewController, presenting presentingViewController: UIViewController?, cancellable: Bool = true) {
+    fatalError("init(presentedViewController:presenting:cancellable:) has not been implemented")
+  }
+  
  override var frameOfPresentedViewInContainerView: CGRect {
    let f = super.frameOfPresentedViewInContainerView
    return CGRect(x: 0, y: f.height - height, width: f.width, height: height)
--- a/iphone/Maps/Classes/Components/Modal/DimmedModalPresentationController.swift
+++ b/iphone/Maps/Classes/Components/Modal/DimmedModalPresentationController.swift
@ -6,10 +6,19 @@ class DimmedModalPresentationController: UIPresentationController {
  private lazy var dimView: UIView = {
    let view = UIView()
    view.backgroundColor = UIColor.blackStatusBarBackground()
-    view.addGestureRecognizer(onTapGr)
+    if isCancellable {
+      view.addGestureRecognizer(onTapGr)
+    }
    return view
  }()

+  let isCancellable: Bool
+
+  required init(presentedViewController: UIViewController, presenting presentingViewController: UIViewController?, cancellable: Bool = true) {
+    isCancellable = cancellable
+    super.init(presentedViewController: presentedViewController, presenting: presentingViewController)
+  }
+
  @objc private func onTap() {
    presentingViewController.dismiss(animated: true, completion: nil)
  }
--- a/iphone/Maps/Classes/Components/Modal/FadeTransitioning.swift
+++ b/iphone/Maps/Classes/Components/Modal/FadeTransitioning.swift
@ -1,6 +1,13 @@
-class FadeTransitioning<T: UIPresentationController>: NSObject, UIViewControllerTransitioningDelegate {
+class FadeTransitioning<T: DimmedModalPresentationController>: NSObject, UIViewControllerTransitioningDelegate {
  let presentedTransitioning = FadeInAnimatedTransitioning()
  let dismissedTransitioning = FadeOutAnimatedTransitioning()
+  let isCancellable: Bool
+
+  init(cancellable: Bool = true) {
+    isCancellable = cancellable
+    super.init()
+  }
+
  func animationController(forPresented presented: UIViewController,
                           presenting: UIViewController,
                           source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
@ -14,6 +21,6 @@ class FadeTransitioning<T: UIPresentationController>: NSObject, UIViewController
  func presentationController(forPresented presented: UIViewController,
                              presenting: UIViewController?,
                              source: UIViewController) -> UIPresentationController? {
-    return T(presentedViewController: presented, presenting: presenting)
+    return T(presentedViewController: presented, presenting: presenting, cancellable: isCancellable)
  }
 }
--- a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h
+++ b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h
@ -98,12 +98,14 @@ typedef void (^PingCompletionBlock)(BOOL success);
                    progress:(_Nullable ProgressBlock)progress
                  completion:(UploadCompletionBlock)completion;
 - (void)ping:(PingCompletionBlock)callback;
+- (void)checkForInvalidCategories:(MWMBoolBlock)completion;
+- (void)deleteInvalidCategories;
+- (void)resetInvalidCategories;

 - (instancetype)init __attribute__((unavailable("call +manager instead")));
 - (instancetype)copy __attribute__((unavailable("call +manager instead")));
 - (instancetype)copyWithZone:(NSZone *)zone __attribute__((unavailable("call +manager instead")));
-+ (instancetype)allocWithZone:(struct _NSZone *)zone
-__attribute__((unavailable("call +manager instead")));
+ (instancetype)allocWithZone:(struct _NSZone *)zone __attribute__((unavailable("call +manager instead")));
 + (instancetype) new __attribute__((unavailable("call +manager instead")));

@end
--- a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
+++ b/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm
@ -749,6 +749,20 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result)
  });
 }

+- (void)checkForInvalidCategories:(MWMBoolBlock)completion {
+  self.bm.CheckInvalidCategories(Purchase::GetDeviceId(), [completion] (bool hasInvalidCategories) {
+    completion(hasInvalidCategories);
+  });
+}
+
+- (void)deleteInvalidCategories {
+  self.bm.DeleteInvalidCategories();
+}
+
+- (void)resetInvalidCategories {
+  self.bm.ResetInvalidCategories();
+}
+
 #pragma mark - Helpers

 - (void)loopObservers:(void (^)(id<MWMBookmarksObserver> observer))block
--- a/iphone/Maps/Core/InappPurchase/Impl/InAppBilling.swift
+++ b/iphone/Maps/Core/InappPurchase/Impl/InAppBilling.swift
@ -72,16 +72,21 @@ final class InAppBilling: NSObject, IInAppBilling {

 extension InAppBilling: SKProductsRequestDelegate {
  func productsRequest(_ request: SKProductsRequest, didReceive response: SKProductsResponse) {
-    let products = response.products.map { BillingProduct($0) }
-    productsCompletion?(products, nil)
-    productsCompletion = nil
-    productRequest = nil
+    DispatchQueue.main.async { [weak self] in
+      let products = response.products.map { BillingProduct($0) }
+      self?.productsCompletion?(products, nil)
+      self?.productsCompletion = nil
+      self?.productRequest = nil
+
+    }
  }

  func request(_ request: SKRequest, didFailWithError error: Error) {
-    productsCompletion?(nil, error)
-    productsCompletion = nil
-    productRequest = nil
+    DispatchQueue.main.async { [weak self] in
+      self?.productsCompletion?(nil, error)
+      self?.productsCompletion = nil
+      self?.productRequest = nil
+    }
  }
 }

--- a/iphone/Maps/Core/Subscriptions/SubscriptionManager.swift
+++ b/iphone/Maps/Core/Subscriptions/SubscriptionManager.swift
@ -1,6 +1,6 @@
@objc protocol SubscriptionManagerListener: AnyObject {
  func didFailToSubscribe(_ subscription: ISubscription, error: Error?)
-  func didSubsribe(_ subscription: ISubscription)
+  func didSubscribe(_ subscription: ISubscription)
  func didDefer(_ subscription: ISubscription)
  func didFailToValidate()
  func didValidate(_ isValid: Bool)
@ -111,24 +111,30 @@ extension SubscriptionManager: SKProductsRequestDelegate {
  func request(_ request: SKRequest, didFailWithError error: Error) {
    Statistics.logEvent(kStatInappPaymentError,
                        withParameters: [kStatError : error.localizedDescription, kStatPurchase : serverId])
-    subscriptionsComplection?(nil, error)
-    subscriptionsComplection = nil
-    productsRequest = nil
+    DispatchQueue.main.async { [weak self] in
+      self?.subscriptionsComplection?(nil, error)
+      self?.subscriptionsComplection = nil
+      self?.productsRequest = nil
+    }
  }

  func productsRequest(_ request: SKProductsRequest, didReceive response: SKProductsResponse) {
    guard response.products.count == productIds.count else {
-      subscriptionsComplection?(nil, NSError(domain: "mapsme.subscriptions", code: -1, userInfo: nil))
-      subscriptionsComplection = nil
-      productsRequest = nil
+      DispatchQueue.main.async { [weak self] in
+        self?.subscriptionsComplection?(nil, NSError(domain: "mapsme.subscriptions", code: -1, userInfo: nil))
+        self?.subscriptionsComplection = nil
+        self?.productsRequest = nil
+      }
      return
    }
    let subscriptions = response.products.map { Subscription($0) }
      .sorted { $0.period.rawValue < $1.period.rawValue }
-    products = Dictionary(uniqueKeysWithValues: response.products.map { ($0.productIdentifier, $0) })
-    subscriptionsComplection?(subscriptions, nil)
-    subscriptionsComplection = nil
-    productsRequest = nil
+    DispatchQueue.main.async { [weak self] in
+      self?.products = Dictionary(uniqueKeysWithValues: response.products.map { ($0.productIdentifier, $0) })
+      self?.subscriptionsComplection?(subscriptions, nil)
+      self?.subscriptionsComplection = nil
+      self?.productsRequest = nil
+    }
  }
 }

@ -168,14 +174,14 @@ extension SubscriptionManager: SKPaymentTransactionObserver {
    paymentQueue.finishTransaction(transaction)
    if let ps = pendingSubscription, transaction.payment.productIdentifier == ps.productId {
      Statistics.logEvent(kStatInappPaymentSuccess, withParameters: [kStatPurchase : serverId])
-      listeners.allObjects.forEach { $0.didSubsribe(ps) }
+      listeners.allObjects.forEach { $0.didSubscribe(ps) }
    }
  }

  private func processRestored(_ transaction: SKPaymentTransaction) {
    paymentQueue.finishTransaction(transaction)
    if let ps = pendingSubscription, transaction.payment.productIdentifier == ps.productId {
-      listeners.allObjects.forEach { $0.didSubsribe(ps) }
+      listeners.allObjects.forEach { $0.didSubscribe(ps) }
    }
  }

--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@ -448,6 +448,7 @@
 		47E3C72F2111F472008B3B27 /* CoverVerticalModalTransitioning.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47E3C72E2111F472008B3B27 /* CoverVerticalModalTransitioning.swift */; };
 		47E3C7312111F4C2008B3B27 /* CoverVerticalPresentationAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47E3C7302111F4C2008B3B27 /* CoverVerticalPresentationAnimator.swift */; };
 		47E3C7332111F4D8008B3B27 /* CoverVerticalDismissalAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47E3C7322111F4D8008B3B27 /* CoverVerticalDismissalAnimator.swift */; };
+		47E6688A23196F0100057733 /* UIViewController+Subscription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47E6688923196F0000057733 /* UIViewController+Subscription.swift */; };
 		47E6CB0B2178BA3600EA102B /* SearchBannerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47E6CB092178BA3600EA102B /* SearchBannerCell.swift */; };
 		47E6CB0C2178BA3600EA102B /* SearchBannerCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 47E6CB0A2178BA3600EA102B /* SearchBannerCell.xib */; };
 		47EF05B321504D8F00EAC269 /* RemoveAdsPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47EF05B221504D8F00EAC269 /* RemoveAdsPresentationController.swift */; };
@ -1556,6 +1557,7 @@
 		47E3C72E2111F472008B3B27 /* CoverVerticalModalTransitioning.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoverVerticalModalTransitioning.swift; sourceTree = "<group>"; };
 		47E3C7302111F4C2008B3B27 /* CoverVerticalPresentationAnimator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoverVerticalPresentationAnimator.swift; sourceTree = "<group>"; };
 		47E3C7322111F4D8008B3B27 /* CoverVerticalDismissalAnimator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoverVerticalDismissalAnimator.swift; sourceTree = "<group>"; };
+		47E6688923196F0000057733 /* UIViewController+Subscription.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Subscription.swift"; sourceTree = "<group>"; };
 		47E6CB092178BA3600EA102B /* SearchBannerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchBannerCell.swift; sourceTree = "<group>"; };
 		47E6CB0A2178BA3600EA102B /* SearchBannerCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SearchBannerCell.xib; sourceTree = "<group>"; };
 		47EF05B221504D8F00EAC269 /* RemoveAdsPresentationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoveAdsPresentationController.swift; sourceTree = "<group>"; };
@ -3690,6 +3692,7 @@
 				4710366422D3764600585272 /* BookmarksSubscriptionCellViewController.xib */,
 				CD4A1F19230EADC100F2A6B6 /* CatalogConnectionErrorView.swift */,
 				CD4A1F1B230EB43B00F2A6B6 /* CatalogConnectionErrorView.xib */,
+				47E6688923196F0000057733 /* UIViewController+Subscription.swift */,
 			);
 			path = Catalog;
 			sourceTree = "<group>";
@ -5423,6 +5426,7 @@
 				3462258F1DDC5DBA001E8752 /* MWMSearchNoResultsAlert.mm in Sources */,
 				470F5A7D2189BB2F00754295 /* PaidRoutePurchase.swift in Sources */,
 				34AB66171FC5AA320078E451 /* MWMiPhoneRoutePreview.m in Sources */,
+				47E6688A23196F0100057733 /* UIViewController+Subscription.swift in Sources */,
 				6741A9E71BF340DE002C974C /* MWMCircularProgressView.mm in Sources */,
 				34AC8FDB1EFC07FE00E7F910 /* UILabel+NumberOfVisibleLines.swift in Sources */,
 				4767CD9F20AAD48A00BD8166 /* Checkmark.swift in Sources */,
--- a/iphone/Maps/UI/Ads/RemoveAdsViewController.swift
+++ b/iphone/Maps/UI/Ads/RemoveAdsViewController.swift
@ -229,7 +229,7 @@ extension RemoveAdsViewController: SubscriptionManagerListener {

  }

-  func didSubsribe(_ subscription: ISubscription) {
+  func didSubscribe(_ subscription: ISubscription) {
    MWMPurchaseManager.setAdsDisabled(true)
    hidePurchaseProgress()
    delegate?.didCompleteSubscribtion(self)