浏览代码

Add completeTransactions() method to be called in applicationDidFinishLaunching() to finish pending transactions so that they don't interfere with any future payments

Andrea Bizzotto 9 年之前
父节点
当前提交
176a155245

+ 17 - 25
SwiftyStoreDemo/AppDelegate.swift

@@ -23,40 +23,32 @@
 // THE SOFTWARE.
 
 import UIKit
+import SwiftyStoreKit
 
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-
     func application(application: UIApplication, didFinishLaunchingWithOptions launchOptions: [NSObject: AnyObject]?) -> Bool {
-        // Override point for customization after application launch.
-        return true
-    }
-
-    func applicationWillResignActive(application: UIApplication) {
-        // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
-        // Use this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates. Games should use this method to pause the game.
-    }
-
-    func applicationDidEnterBackground(application: UIApplication) {
-        // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later.
-        // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits.
-    }
 
-    func applicationWillEnterForeground(application: UIApplication) {
-        // Called as part of the transition from the background to the inactive state; here you can undo many of the changes made on entering the background.
-    }
-
-    func applicationDidBecomeActive(application: UIApplication) {
-        // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface.
+        completeIAPTransactions()
+        
+        return true
     }
-
-    func applicationWillTerminate(application: UIApplication) {
-        // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
+    
+    func completeIAPTransactions() {
+        
+        SwiftyStoreKit.completeTransactions() { completedTransactions in
+            
+            for completedTransaction in completedTransactions {
+                
+                if completedTransaction.transactionState == .Purchased || completedTransaction.transactionState == .Restored {
+                    
+                    print("purchased: \(completedTransaction.productId)")
+                }
+            }
+        }
     }
-
-
 }
 

+ 6 - 0
SwiftyStoreKit.xcodeproj/project.pbxproj

@@ -18,6 +18,8 @@
 		6502F63A1B985C9E004E342D /* InAppProductPurchaseRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6502F6221B98586A004E342D /* InAppProductPurchaseRequest.swift */; };
 		6502F63B1B985CA1004E342D /* InAppProductQueryRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6502F6231B98586A004E342D /* InAppProductQueryRequest.swift */; };
 		6502F63C1B985CA4004E342D /* SwiftyStoreKit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6502F6241B98586A004E342D /* SwiftyStoreKit.swift */; };
+		651A71251CD651AF000B4091 /* InAppCompleteTransactionsObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 651A71241CD651AF000B4091 /* InAppCompleteTransactionsObserver.swift */; };
+		651A71261CD651AF000B4091 /* InAppCompleteTransactionsObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 651A71241CD651AF000B4091 /* InAppCompleteTransactionsObserver.swift */; };
 		65C1B5DF1BB9DE9B00F7BF4E /* NetworkActivityIndicatorManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 65C1B5DE1BB9DE9B00F7BF4E /* NetworkActivityIndicatorManager.swift */; };
 		C4083C551C2AADB500295248 /* InAppReceipt.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4A7C7621C29B8D00053ED64 /* InAppReceipt.swift */; };
 		C4083C571C2AB0A900295248 /* InAppReceiptRefreshRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4083C561C2AB0A900295248 /* InAppReceiptRefreshRequest.swift */; };
@@ -93,6 +95,7 @@
 		6502F62D1B985C40004E342D /* SwiftyStoreKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftyStoreKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		6502F62F1B985C40004E342D /* SwiftyStoreKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SwiftyStoreKit.h; sourceTree = "<group>"; };
 		6502F6311B985C40004E342D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		651A71241CD651AF000B4091 /* InAppCompleteTransactionsObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InAppCompleteTransactionsObserver.swift; sourceTree = "<group>"; };
 		65C1B5DE1BB9DE9B00F7BF4E /* NetworkActivityIndicatorManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NetworkActivityIndicatorManager.swift; sourceTree = "<group>"; };
 		C4083C561C2AB0A900295248 /* InAppReceiptRefreshRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InAppReceiptRefreshRequest.swift; sourceTree = "<group>"; };
 		C40C680F1C29414C00B60B7E /* OS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OS.swift; sourceTree = "<group>"; };
@@ -171,6 +174,7 @@
 				6502F6231B98586A004E342D /* InAppProductQueryRequest.swift */,
 				C4083C561C2AB0A900295248 /* InAppReceiptRefreshRequest.swift */,
 				C4A7C7621C29B8D00053ED64 /* InAppReceipt.swift */,
+				651A71241CD651AF000B4091 /* InAppCompleteTransactionsObserver.swift */,
 				6502F6241B98586A004E342D /* SwiftyStoreKit.swift */,
 				C40C680F1C29414C00B60B7E /* OS.swift */,
 				6502F62F1B985C40004E342D /* SwiftyStoreKit.h */,
@@ -407,6 +411,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				C40C68101C29414C00B60B7E /* OS.swift in Sources */,
+				651A71251CD651AF000B4091 /* InAppCompleteTransactionsObserver.swift in Sources */,
 				6502F63A1B985C9E004E342D /* InAppProductPurchaseRequest.swift in Sources */,
 				6502F63B1B985CA1004E342D /* InAppProductQueryRequest.swift in Sources */,
 				C4083C571C2AB0A900295248 /* InAppReceiptRefreshRequest.swift in Sources */,
@@ -420,6 +425,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				C40C68111C29419500B60B7E /* OS.swift in Sources */,
+				651A71261CD651AF000B4091 /* InAppCompleteTransactionsObserver.swift in Sources */,
 				C4D74BC31C24CEDC0071AD3E /* InAppProductPurchaseRequest.swift in Sources */,
 				C4D74BC41C24CEDC0071AD3E /* InAppProductQueryRequest.swift in Sources */,
 				C4F69A8A1C2E0D21009DD8BD /* InAppReceiptRefreshRequest.swift in Sources */,

+ 98 - 0
SwiftyStoreKit/InAppCompleteTransactionsObserver.swift

@@ -0,0 +1,98 @@
+//
+// InAppPurchaseObserver.swift
+// SwiftyStoreKit
+//
+// Copyright (c) 2016 Andrea Bizzotto (bizz84@gmail.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+
+import StoreKit
+
+extension PaymentTransactionState {
+    
+    var stringValue: String {
+        switch self {
+        case Purchasing: return "Purchasing"
+        case Purchased: return "Purchased"
+        case Failed: return "Failed"
+        case Restored: return "Restored"
+        case Deferred: return "Deferred"
+        }
+    }
+}
+
+class InAppCompleteTransactionsObserver: NSObject, SKPaymentTransactionObserver {
+    
+    private var callbackCalled: Bool = false
+        
+    typealias TransactionsCallback = (completedTransactions: [SwiftyStoreKit.CompletedTransaction]) -> ()
+    
+    var paymentQueue: SKPaymentQueue {
+        return SKPaymentQueue.defaultQueue()
+    }
+
+    deinit {
+        paymentQueue.removeTransactionObserver(self)
+    }
+
+    let callback: TransactionsCallback
+    
+    init(callback: TransactionsCallback) {
+    
+        self.callback = callback
+        super.init()
+        paymentQueue.addTransactionObserver(self)
+    }
+
+    func paymentQueue(queue: SKPaymentQueue, updatedTransactions transactions: [SKPaymentTransaction]) {
+        
+        if callbackCalled {
+            return
+        }
+        if SwiftyStoreKit.hasInFlightPayments {
+            return
+        }
+        
+        var completedTransactions: [SwiftyStoreKit.CompletedTransaction] = []
+        
+        for transaction in transactions {
+            
+            #if os(iOS)
+                let transactionState = transaction.transactionState
+            #elseif os(OSX)
+                let transactionState = PaymentTransactionState(rawValue: transaction.transactionState)!
+            #endif
+
+            if transactionState != .Purchasing {
+                
+                let completedTransaction = SwiftyStoreKit.CompletedTransaction(productId: transaction.payment.productIdentifier, transactionState: transactionState)
+                
+                completedTransactions.append(completedTransaction)
+                
+                print("Removing unregistered payment \"\(transaction.payment.productIdentifier)\", state: \(transactionState.stringValue)")
+                
+                paymentQueue.finishTransaction(transaction)
+            }
+        }
+        callbackCalled = true
+
+        callback(completedTransactions: completedTransactions)
+    }
+}

+ 2 - 2
SwiftyStoreKit/OS.swift

@@ -26,9 +26,9 @@ import StoreKit
 
 // MARK: - missing SKPaymentTransactionState on OSX
 #if os(iOS)
-    typealias PaymentTransactionState = SKPaymentTransactionState
+    public typealias PaymentTransactionState = SKPaymentTransactionState
 #elseif os(OSX)
-    enum PaymentTransactionState : Int {
+    public enum PaymentTransactionState : Int {
         case Purchasing // Transaction is being added to the server queue.
         case Purchased // Transaction is in queue, user has been charged.  Client should complete the transaction.
         case Failed // Transaction was cancelled or failed before being added to the server queue.

+ 14 - 0
SwiftyStoreKit/SwiftyStoreKit.swift

@@ -51,6 +51,7 @@ public class SwiftyStoreKit {
     private var inflightQueries: [Set<String>: InAppProductQueryRequest] = [:]
     private var inflightPurchases: [String: InAppProductPurchaseRequest] = [:]
     private var restoreRequest: InAppProductPurchaseRequest?
+    private var completeTransactionsObserver: InAppCompleteTransactionsObserver?
     #if os(iOS)
     private var receiptRefreshRequest: InAppReceiptRefreshRequest?
     #endif
@@ -79,6 +80,11 @@ public class SwiftyStoreKit {
         case Success
         case Error(error: ErrorType)
     }
+    public struct CompletedTransaction {
+        public let productId: String
+        public let transactionState: PaymentTransactionState
+    }
+
     public enum InternalErrorCode: Int {
         case RestoredPurchaseWhenPurchasing = 0
         case PurchasedWhenRestoringPurchase = 1
@@ -91,6 +97,14 @@ public class SwiftyStoreKit {
         return SKPaymentQueue.canMakePayments()
     }
     
+    class var hasInFlightPayments: Bool {
+        return sharedInstance.inflightPurchases.count > 0 || sharedInstance.restoreRequest != nil
+    }
+    
+    public class func completeTransactions(completion: (completedTransactions: [CompletedTransaction]) -> ()) {
+        sharedInstance.completeTransactionsObserver = InAppCompleteTransactionsObserver(callback: completion)
+    }
+    
     // MARK: Public methods
     public class func retrieveProductsInfo(productIds: Set<String>, completion: (result: RetrieveResults) -> ()) {
         

+ 16 - 4
SwiftyStoreOSXDemo/AppDelegate.swift

@@ -23,16 +23,28 @@
 // THE SOFTWARE.
 
 import Cocoa
+import SwiftyStoreKit
 
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate {
 
     func applicationDidFinishLaunching(aNotification: NSNotification) {
-        // Insert code here to initialize your application
-    }
 
-    func applicationWillTerminate(aNotification: NSNotification) {
-        // Insert code here to tear down your application
+        completeIAPTransactions()
+    }
+    
+    func completeIAPTransactions() {
+        
+        SwiftyStoreKit.completeTransactions() { completedTransactions in
+            
+            for completedTransaction in completedTransactions {
+                
+                if completedTransaction.transactionState == .Purchased || completedTransaction.transactionState == .Restored {
+                    
+                    print("purchased: \(completedTransaction.productId)")
+                }
+            }
+        }
     }
 }