Changed productPurchased to retrun a tuple with isPurchased and hasVa…

…lidReceipt Bools
sandorgyulai · Oct 31, 2015 · 20cd51b · 20cd51b
1 parent f7676b2
commit 20cd51b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/InAppFw.podspec b/InAppFw.podspec
@@ -5,7 +5,7 @@ Pod::Spec.new do |s|
   s.name = "InAppFw"
   s.summary = "In App Purchase Manager framework for iOS"
   s.requires_arc = true
-  s.version = "0.9.1"
+  s.version = "0.9.2"
   s.license = { :type => "MIT", :file => "LICENSE" }
   s.author = { "Sandor Gyulai" => "sandor.gyulai@icloud.com" }
   s.homepage = "https://github.com/sandorgyulai/InAppFramework"

diff --git a/InAppFw/InAppFw.swift b/InAppFw/InAppFw.swift
@@ -36,7 +36,7 @@ public class InAppFw: NSObject, SKProductsRequestDelegate, SKPaymentTransactionO
 
     var purchasedProductIdentifiers = Set<String>()
 
-    public var hasValidReceipt = false
+    private var hasValidReceipt = false
 
     public override init() {
         super.init()
@@ -151,14 +151,14 @@ public class InAppFw: NSObject, SKProductsRequestDelegate, SKPaymentTransactionO
                 if let status = jsonResponse["status"] as? Int {
                     if status == 0 {
                         print("Status: VALID")
-                        self.hasValidReceipt = true
+                        hasValidReceipt = true
                         completion(valid: true)
                     } else if status == 21007 {
                         print("Status: CHECK WITH SANDBOX")
-                        self.validateReceipt(true, completion: completion)
+                        validateReceipt(true, completion: completion)
                     } else {
                         print("Status: INVALID")
-                        self.hasValidReceipt = false
+                        hasValidReceipt = false
                         completion(valid: false)
                     }
                 }
@@ -202,8 +202,11 @@ public class InAppFw: NSObject, SKProductsRequestDelegate, SKPaymentTransactionO
     /**
         Check if the product with identifier is already purchased
     */
-    public func productPurchased(productIdentifier: String) -> Bool {
-        return purchasedProductIdentifiers.contains(productIdentifier)
+    public func productPurchased(productIdentifier: String) -> (isPurchased: Bool, hasValidReceipt: Bool) {
+
+        let purchased = purchasedProductIdentifiers.contains(productIdentifier)
+        return (purchased, hasValidReceipt)
+
     }
 
     /**
@@ -218,14 +221,14 @@ public class InAppFw: NSObject, SKProductsRequestDelegate, SKPaymentTransactionO
     private func completeTransaction(transaction: SKPaymentTransaction) {
         print("Complete Transaction...")
 
-        self.provideContentForProductIdentifier(transaction.payment.productIdentifier)
+        provideContentForProductIdentifier(transaction.payment.productIdentifier)
         SKPaymentQueue.defaultQueue().finishTransaction(transaction)
     }
 
     private func restoreTransaction(transaction: SKPaymentTransaction) {
         print("Restore Transaction...")
 
-        self.provideContentForProductIdentifier(transaction.originalTransaction!.payment.productIdentifier)
+        provideContentForProductIdentifier(transaction.originalTransaction!.payment.productIdentifier)
         SKPaymentQueue.defaultQueue().finishTransaction(transaction)
     }