feat: update PurchaseManager.swift

ivpn · Apr 16, 2024 · 1d9df14 · 1d9df14
1 parent 6b8a786
commit 1d9df14
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/IVPNClient/AppDelegate.swift b/IVPNClient/AppDelegate.swift
@@ -412,7 +412,7 @@ extension AppDelegate: PurchaseManagerDelegate {
         }
     }
 
-    func purchaseSuccess(service: Any?, extended: Bool) {
+    func purchaseSuccess(activeUntil: String, extended: Bool) {
         guard extended else {
             return
         }
@@ -422,9 +422,7 @@ extension AppDelegate: PurchaseManagerDelegate {
                 return
             }
 
-            if let service = service as? ServiceStatus {
-                viewController.showSubscriptionActivatedAlert(serviceStatus: service)
-            }
+            viewController.showSubscriptionActivatedAlert(activeUntil: activeUntil)
         }
     }
 

diff --git a/IVPNClient/Managers/PurchaseManager.swift b/IVPNClient/Managers/PurchaseManager.swift
@@ -26,7 +26,7 @@ import StoreKit
 @objc protocol PurchaseManagerDelegate: AnyObject {
     func purchaseStart()
     func purchasePending()
-    func purchaseSuccess(service: Any?, extended: Bool)
+    func purchaseSuccess(activeUntil: String, extended: Bool)
     func purchaseError(error: Any?)
 }
 
@@ -167,7 +167,7 @@ class PurchaseManager: NSObject {
                 Application.shared.serviceStatus = sessionStatus.serviceStatus
                 Task {
                     await transaction.finish()
-                    self.delegate?.purchaseSuccess(service: sessionStatus.serviceStatus, extended: sessionStatus.extended ?? false)
+                    self.delegate?.purchaseSuccess(activeUntil: sessionStatus.serviceStatus.activeUntilString(), extended: sessionStatus.extended ?? !sessionStatus.serviceStatus.isNewStyleAccount())
                     log(.info, message: "[Store] Purchase \(transaction.productID) completed successfully")
                 }
             case .failure(let error):

diff --git a/IVPNClient/Scenes/Signup/Payment/PaymentViewController.swift b/IVPNClient/Scenes/Signup/Payment/PaymentViewController.swift
@@ -286,7 +286,7 @@ extension PaymentViewController: PurchaseManagerDelegate {
         }
     }
 
-    func purchaseSuccess(service: Any?, extended: Bool) {
+    func purchaseSuccess(activeUntil: String, extended: Bool) {
         guard extended else {
             hud.dismiss()
             return
@@ -295,11 +295,7 @@ extension PaymentViewController: PurchaseManagerDelegate {
         DispatchQueue.main.async { [self] in
             hud.dismiss()
 
-            guard let service = service as? ServiceStatus else {
-                return
-            }
-
-            showSubscriptionActivatedAlert(serviceStatus: service) {
+            showSubscriptionActivatedAlert(activeUntil: activeUntil) {
                 if KeyChain.sessionToken == nil {
                     KeyChain.username = KeyChain.tempUsername
                     KeyChain.tempUsername = nil

diff --git a/IVPNClient/Utilities/Extensions/UIViewController+Ext.swift b/IVPNClient/Utilities/Extensions/UIViewController+Ext.swift
@@ -134,10 +134,10 @@ extension UIViewController {
         }
     }
 
-    func showSubscriptionActivatedAlert(serviceStatus: ServiceStatus, completion: (() -> Void)? = nil) {
+    func showSubscriptionActivatedAlert(activeUntil: String, completion: (() -> Void)? = nil) {
         showAlert(
             title: "Thank you!",
-            message: "The payment was successfully processed.\nService is active until: " + serviceStatus.activeUntilString(),
+            message: "The payment was successfully processed.\nService is active until: " + activeUntil,
             handler: { _ in
                 if let completion = completion {
                     completion()