added restore

Author: mdelbo

IAPCatalogue.h

@@ -11,6 +11,7 @@
 - (void)cancel;
 - (IAPProduct*)productForIdentifier:(NSString*)identifier;
 - (void)purchaseProduct:(IAPProduct*)product;
+- (void)restoreProduct:(IAPProduct*)product;
 @end
 
 @protocol IAPCatalogueDelegate <NSObject>

IAPCatalogue.m

@@ -148,6 +148,11 @@ - (void)purchaseProduct:(IAPProduct*)product skProduct:(SKProduct*)skProduct {
     [self.paymentQueue addPayment:payment];
 }
 
+- (void)restoreProduct:(IAPProduct*)product {
+    [self.paymentQueue restoreCompletedTransactions];
+    [product restoreStarted];
+}
+
 - (void)paymentQueue:(SKPaymentQueue *)queue updatedTransactions:(NSArray *)transactions
 {
     for (SKPaymentTransaction *transaction in transactions)
@@ -164,4 +169,16 @@ - (void)paymentQueue:(SKPaymentQueue *)queue updatedTransactions:(NSArray *)tran
     }
 }
 
+- (void)paymentQueue:(SKPaymentQueue *)queue restoreCompletedTransactionsFailedWithError:(NSError *)error {
+    for (IAPProduct* product in self.products) {
+        [product restoreFailedWithError:error];
+    }
+}
+
+- (void)paymentQueueRestoreCompletedTransactionsFinished:(SKPaymentQueue *)queue {
+    for (IAPProduct* product in self.products) {
+        [product restoreEnded];
+    }    
+}
+
 @end

IAPProduct+Friend.h

@@ -20,6 +20,9 @@ extern const NSString* kStateRestored;
 - (void)updateWithSKProduct:(SKProduct*)skProduct;
 - (void)updateWithSKPaymentTransaction:(SKPaymentTransaction*)skTransaction;
 - (void)updateWithSKPayment:(SKPayment*)skPayment;
+- (void)restoreStarted;
+- (void)restoreFailedWithError:(NSError*)error;
+- (void)restoreEnded;
 
 @end
 

IAPProduct.h

@@ -11,19 +11,16 @@
 @property (nonatomic, readonly, assign) BOOL isError;
 @property (nonatomic, readonly, assign) BOOL isPurchasing;
 @property (nonatomic, readonly, assign) BOOL isRestored;
+@property (nonatomic, readonly, assign) BOOL isRestoring;
 
 - (void)addObserver:(id<IAPProductObserver>)iapProductObserver;
 - (void)removeObserver:(id<IAPProductObserver>)iapProductObserver;
 - (void)purchase;
+- (void)restorePurchase;
 
 @end
 
 @protocol IAPProductObserver <NSObject>
 @optional
-- (void)iapProductJustErrored:(IAPProduct*)iapProduct;
-- (void)iapProductJustStartedLoading:(IAPProduct*)iapProduct;
-- (void)iapProductJustBecameReadyForSale:(IAPProduct*)iapProduct;
-- (void)iapProductWasJustPurchased:(IAPProduct*)iapProduct;
-- (void)iapProductWasJustRestored:(IAPProduct*)iapProduct;
-- (void)iapProductIsPurchasing:(IAPProduct*)iapProduct;
+- (void)iapProductWasUpdated:(IAPProduct*)iapProduct;
 @end

IAPProduct.m

@@ -28,6 +28,7 @@ @implementation IAPProduct
 const NSString* kStateReadyForSale = @"ReadyForSale";
 const NSString* kStatePurchased = @"Purchased";
 const NSString* kStatePurchasing = @"Purchasing";
+const NSString* kStateRestoring = @"Restoring";
 const NSString* kStateRestored = @"Restored";
 const NSString* kStateError = @"Error";
 const NSString* kEventSetPrice = @"SetPrice";
@@ -37,6 +38,8 @@ @implementation IAPProduct
 const NSString* kEventSetPurchasing = @"SetPurchasing";
 const NSString* kEventRecoverToReadyForSale = @"RecoverToReadyForSale";
 const NSString* kEventRecoverToLoading = @"RecoverToLoading";
+const NSString* kEventRestoreStarted = @"RestoreStarted";
+const NSString* kEventRestoreEnded = @"RestoreStarted";
 
 - (id)initWithCatalogue:(IAPCatalogue*)catalogue identifier:(NSString*)identifier settings:(NSUserDefaults*)settings {
     self = [super init];
@@ -69,8 +72,14 @@ - (void)loadStateMachine:(const NSString*)initialState {
     [self.stateMachine addTransition:kEventSetPurchasing startState:kStateReadyForSale endState:kStatePurchasing];
     [self.stateMachine addTransition:kEventSetError startState:kStateLoading endState:kStateError];
     [self.stateMachine addTransition:kEventSetError startState:kStatePurchasing endState:kStateError];
+    [self.stateMachine addTransition:kEventSetError startState:kStateRestoring endState:kStateError];    
     [self.stateMachine addTransition:kEventSetPurchased startState:kStatePurchasing endState:kStatePurchased];
+    [self.stateMachine addTransition:kEventSetRestored startState:kStateLoading endState:kStateRestored];
+    [self.stateMachine addTransition:kEventSetRestored startState:kStateReadyForSale endState:kStateRestored];
     [self.stateMachine addTransition:kEventSetRestored startState:kStatePurchasing endState:kStateRestored];
+    [self.stateMachine addTransition:kEventSetRestored startState:kStateRestoring endState:kStateRestored];
+    [self.stateMachine addTransition:kEventRestoreStarted startState:kStateReadyForSale endState:kStateRestoring];
+    [self.stateMachine addTransition:kEventRestoreEnded startState:kStateRestoring endState:kStateReadyForSale];    
 
     [self.stateMachine addObserver:self forKeyPath:@"state" options:NSKeyValueObservingOptionNew context:nil];
     self.state = self.stateMachine.state;
@@ -126,6 +135,23 @@ - (void)updateWithSKPayment:(SKPayment*)skPayment {
     [self save];
 }
 
+- (void)restoreStarted {
+    [self.stateMachine applyEvent:kEventRestoreStarted];
+}
+
+- (void)restoreFailedWithError:(NSError*)error {
+    if (self.state == kStateRestoring) {
+        [self.stateMachine applyEvent:kEventSetError];    
+        [self.stateMachine applyEvent:kEventRecoverToReadyForSale];
+    }
+}
+
+- (void)restoreEnded {
+    if (self.state == kStateRestoring) {
+        [self.stateMachine applyEvent:kEventRestoreEnded];
+    }
+}
+
 - (NSString*)settingsKey:(NSString*)setting {
     return [NSString stringWithFormat:@"IAP%@%@", self.identifier, setting];
 }
@@ -184,10 +210,18 @@ - (BOOL)isRestored {
     return [self.stateMachine isInState:kStateRestored];
 }
 
+- (BOOL)isRestoring {
+    return [self.stateMachine isInState:kStateRestoring];
+}
+
 - (void)purchase {
     [self.catalogue purchaseProduct:self];
 }
 
+- (void)restorePurchase {
+    [self.catalogue restoreProduct:self];
+}
+
 - (void)addObserver:(id<IAPProductObserver>)iapProductObserver {
     [self.observers addObject:[NSValue valueWithNonretainedObject:iapProductObserver]];
     [self cleanEmptyObservers];
@@ -201,26 +235,8 @@ - (void)removeObserver:(id<IAPProductObserver>)iapProductObserver {
 - (void)notifyObserversOfStateChange {
     for (NSValue* observer in self.observers) {
         id<IAPProductObserver> iapProductObserver = [observer nonretainedObjectValue];
-        if (!iapProductObserver)
-            continue;
-        
-        if (self.isLoading && [iapProductObserver respondsToSelector:@selector(iapProductJustStartedLoading::)]) {
-            [iapProductObserver iapProductJustStartedLoading:self];
-        }
-        else if (self.isError && [iapProductObserver respondsToSelector:@selector(iapProductJustErrored:)]) {
-            [iapProductObserver iapProductJustErrored:self];
-        }
-        else if (self.isReadyForSale && [iapProductObserver respondsToSelector:@selector(iapProductJustBecameReadyForSale:)]) {
-            [iapProductObserver iapProductJustBecameReadyForSale:self];
-        }
-        else if (self.isPurchased && [iapProductObserver respondsToSelector:@selector(iapProductWasJustPurchased:)]) {
-            [iapProductObserver iapProductWasJustPurchased:self];
-        }
-        else if (self.isPurchasing && [iapProductObserver respondsToSelector:@selector(iapProductIsPurchasing:)]) {
-            [iapProductObserver iapProductIsPurchasing:self];
-        }
-        else if (self.isRestored && [iapProductObserver respondsToSelector:@selector(iapProductWasJustRestored:)]) {
-            [iapProductObserver iapProductWasJustRestored:self];
+        if (iapProductObserver && [iapProductObserver respondsToSelector:@selector(iapProductWasUpdated:)]) {
+            [iapProductObserver iapProductWasUpdated:self];
         }
     }