This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/Services/PlanService.swift b/WordPress/Classes/Services/PlanService.swift | |
| index 7b7d31c..0ee6982 100644 | |
| --- a/WordPress/Classes/Services/PlanService.swift | |
| +++ b/WordPress/Classes/Services/PlanService.swift | |
| @@ -1,12 +1,18 @@ | |
| import Foundation | |
| +typealias PlanFeatures = [PlanID: [PlanFeature]] | |
| + | |
| struct PlanService { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/Services/Store.swift b/WordPress/Classes/Services/Store.swift | |
| index daa668b..e8112f6 100644 | |
| --- a/WordPress/Classes/Services/Store.swift | |
| +++ b/WordPress/Classes/Services/Store.swift | |
| @@ -30,6 +30,10 @@ struct StoreKitCoordinator { | |
| typealias PendingPayment = (planID: PlanID, productID: String, siteID: Int) | |
| +enum StoreCoordinatorError: ErrorType { | |
| + case PaymentAlreadyInProgress |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/ViewRelated/Post/AbstractPostListViewController.swift b/WordPress/Classes/ViewRelated/Post/AbstractPostListViewController.swift | |
| index 49d4673..9dc5ec7 100644 | |
| --- a/WordPress/Classes/ViewRelated/Post/AbstractPostListViewController.swift | |
| +++ b/WordPress/Classes/ViewRelated/Post/AbstractPostListViewController.swift | |
| @@ -162,10 +162,6 @@ class AbstractPostListViewController : UIViewController, WPContentSyncHelperDele | |
| override func viewWillDisappear(animated: Bool) { | |
| super.viewWillDisappear(animated) | |
| - if searchController.active { | |
| - searchController.active = false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/Simperium/SPAuthenticator.h b/Simperium/SPAuthenticator.h | |
| index 6148933..83c1a54 100644 | |
| --- a/Simperium/SPAuthenticator.h | |
| +++ b/Simperium/SPAuthenticator.h | |
| @@ -22,6 +22,7 @@ typedef void(^FailedBlockType)(int responseCode, NSString *responseString); | |
| @protocol SPAuthenticatorDelegate <NSObject> | |
| @optional | |
| - (void)authenticationDidSucceedForUsername:(NSString *)username token:(NSString *)token; | |
| +- (void)authenticationDidCreateAccount; | |
| - (void)authenticationDidFail; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/ViewRelated/Blog/BlogDetailsViewController.m b/WordPress/Classes/ViewRelated/Blog/BlogDetailsViewController.m | |
| index 2857058..06eab07 100644 | |
| --- a/WordPress/Classes/ViewRelated/Blog/BlogDetailsViewController.m | |
| +++ b/WordPress/Classes/ViewRelated/Blog/BlogDetailsViewController.m | |
| @@ -712,7 +712,12 @@ - (void)showStats | |
| StatsViewController *statsView = [StatsViewController new]; | |
| statsView.blog = self.blog; | |
| statsView.statsService = self.statsService; | |
| - [self showDetailViewController:statsView sender:self]; | |
| + |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/Utility/WPFeedbackGenerators.swift b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| index 04a9ac9..228c9d2 100644 | |
| --- a/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| +++ b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| @@ -28,7 +28,11 @@ class WPNotificationFeedbackGenerator: NSObject { | |
| return | |
| } | |
| - let generator = UINotificationFeedbackGenerator() | |
| + notificationOccurred(notificationType, withGenerator: UINotificationFeedbackGenerator()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/Utility/WPFeedbackGenerators.swift b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| index 04a9ac9..228c9d2 100644 | |
| --- a/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| +++ b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| @@ -28,7 +28,11 @@ class WPNotificationFeedbackGenerator: NSObject { | |
| return | |
| } | |
| - let generator = UINotificationFeedbackGenerator() | |
| + notificationOccurred(notificationType, withGenerator: UINotificationFeedbackGenerator()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/Utility/WPFeedbackGenerators.swift b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| index 04a9ac9..228c9d2 100644 | |
| --- a/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| +++ b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| @@ -28,7 +28,11 @@ class WPNotificationFeedbackGenerator: NSObject { | |
| return | |
| } | |
| - let generator = UINotificationFeedbackGenerator() | |
| + notificationOccurred(notificationType, withGenerator: UINotificationFeedbackGenerator()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/Utility/WPFeedbackGenerators.swift b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| index 04a9ac9..228c9d2 100644 | |
| --- a/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| +++ b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| @@ -28,7 +28,11 @@ class WPNotificationFeedbackGenerator: NSObject { | |
| return | |
| } | |
| - let generator = UINotificationFeedbackGenerator() | |
| + notificationOccurred(notificationType, withGenerator: UINotificationFeedbackGenerator()) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/WordPress/Classes/Utility/WPFeedbackGenerators.swift b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| index 04a9ac9..228c9d2 100644 | |
| --- a/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| +++ b/WordPress/Classes/Utility/WPFeedbackGenerators.swift | |
| @@ -28,7 +28,11 @@ class WPNotificationFeedbackGenerator: NSObject { | |
| return | |
| } | |
| - let generator = UINotificationFeedbackGenerator() | |
| + notificationOccurred(notificationType, withGenerator: UINotificationFeedbackGenerator()) |