passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore purchases without refreshing receipt first 

Any reason why I was doing that?

Also drop old ProductManager notification.
This commit is contained in:
Davide De Rosa 2022-04-13 20:51:55 +02:00
parent a3202bb218
commit e7a5d82056
1 changed files with 14 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Passepartout/App/Shared/InApp/ProductManager.swift
View File

@ -58,8 +58,6 @@ class ProductManager: NSObject, ObservableObject {
}
}
static let didReloadReceipt = Notification.Name("ProductManagerDidReloadReceipt")
let cfg: Configuration
@Published private(set) var isRefreshingProducts = false
@ -80,8 +78,6 @@ class ProductManager: NSObject, ObservableObject {
private var refreshRequest: SKReceiptRefreshRequest?
private var restoreCompletionHandler: ((Error?) -> Void)?
init(_ cfg: Configuration) {
self.cfg = cfg
products = []
@ -155,19 +151,25 @@ class ProductManager: NSObject, ObservableObject {
}
func purchase(_ product: SKProduct, completionHandler: @escaping (Result<InAppPurchaseResult, Error>) -> Void) {
inApp.purchase(product: product) {
if case .success = $0 {
inApp.purchase(product: product) { result in
if case .success = result {
self.reloadReceipt()
}
completionHandler($0)
DispatchQueue.main.async {
completionHandler(result)
}
}
}
func restorePurchases(completionHandler: @escaping (Error?) -> Void) {
restoreCompletionHandler = completionHandler
refreshRequest = SKReceiptRefreshRequest()
refreshRequest?.delegate = self
refreshRequest?.start()
inApp.restorePurchases { (finished, _, error) in
guard finished else {
return
}
DispatchQueue.main.async {
completionHandler(error)
}
}
}
// MARK: In-app eligibility
@ -263,10 +265,8 @@ class ProductManager: NSObject, ObservableObject {
}
}
pp_log.info("Purchased features: \(purchasedFeatures)")
objectWillChange.send()
if andNotify {
NotificationCenter.default.post(name: ProductManager.didReloadReceipt, object: nil)
objectWillChange.send()
}
}
}
@ -279,30 +279,6 @@ extension ProductManager: SKPaymentTransactionObserver {
}
}
extension ProductManager: SKRequestDelegate {
func requestDidFinish(_ request: SKRequest) {
DispatchQueue.main.async { [weak self] in
self?.reloadReceipt()
}
inApp.restorePurchases { [weak self] (finished, _, error) in
guard finished else {
return
}
DispatchQueue.main.async {
self?.restoreCompletionHandler?(error)
self?.restoreCompletionHandler = nil
}
}
}
func request(_ request: SKRequest, didFailWithError error: Error) {
DispatchQueue.main.async { [weak self] in
self?.restoreCompletionHandler?(error)
self?.restoreCompletionHandler = nil
}
}
}
extension ProductManager {
func hasRefunded() -> Bool {
reloadReceipt(andNotify: false)