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

Lock features with alert if beta

This commit is contained in:
Davide De Rosa 2021-01-07 23:37:32 +01:00
parent cc8c01a13a
commit d1cb70a5d9
7 changed files with 60 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Passepartout/App/iOS/AppDelegate.swift
View File

@ -162,7 +162,7 @@ extension UISplitViewController {
extension AppDelegate {
func application(_ application: UIApplication, continue userActivity: NSUserActivity, restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
guard ProductManager.shared.isEligible(forFeature: .siriShortcuts) else {
guard (try? ProductManager.shared.isEligible(forFeature: .siriShortcuts)) ?? false else {
return false
}
guard let interaction = userActivity.interaction else {

6
Passepartout/App/iOS/Global/Macros.swift
View File

@ -75,6 +75,12 @@ extension UIViewController {
present(nav, animated: true, completion: nil)
}
func presentBetaFeatureUnavailable(_ title: String) {
let alert = UIAlertController.asAlert(title, "The requested feature is unavailable in beta.")
alert.addCancelAction("OK")
present(alert, animated: true, completion: nil)
}
}
func visitURL(_ url: URL) {

4
Passepartout/App/iOS/Global/ProductManager+App.swift
View File

@ -46,7 +46,7 @@ extension ProductManager {
// review features and potentially revert them if they were used (Siri is handled in AppDelegate)
log.debug("Checking 'Trusted networks'")
if !isEligible(forFeature: .trustedNetworks) {
if !((try? isEligible(forFeature: .trustedNetworks)) ?? false) {
// reset trusted networks for ALL profiles (must load first)
for key in service.allProfileKeys() {
@ -76,7 +76,7 @@ extension ProductManager {
guard let metadata = InfrastructureFactory.shared.metadata(forName: name) else {
continue
}
if !isEligible(forProvider: metadata) {
if !((try? isEligible(forProvider: metadata)) ?? false) {
service.removeProfile(ProfileKey(name))
log.debug("\tRefunded provider: \(name)")
anyRefund = true

9
Passepartout/App/iOS/Scenes/Organizer/OrganizerViewController.swift
View File

@ -241,8 +241,13 @@ class OrganizerViewController: UITableViewController, StrongTableHost {
}
private func addShortcuts() {
guard ProductManager.shared.isEligible(forFeature: .siriShortcuts) else {
presentPurchaseScreen(forProduct: .siriShortcuts)
do {
guard try ProductManager.shared.isEligible(forFeature: .siriShortcuts) else {
presentPurchaseScreen(forProduct: .siriShortcuts)
return
}
} catch {
presentBetaFeatureUnavailable("Siri")
return
}
perform(segue: StoryboardSegue.Organizer.siriShortcutsSegueIdentifier)

11
Passepartout/App/iOS/Scenes/Organizer/WizardProviderViewController.swift
View File

@ -70,11 +70,16 @@ class WizardProviderViewController: UITableViewController, StrongTableHost {
private func tryNext(withMetadata metadata: Infrastructure.Metadata, purchaseIfNecessary: Bool) {
selectedMetadata = metadata
guard ProductManager.shared.isEligible(forProvider: metadata) else {
guard purchaseIfNecessary else {
do {
guard try ProductManager.shared.isEligible(forProvider: metadata) else {
guard purchaseIfNecessary else {
return
}
presentPurchaseScreen(forProduct: metadata.product, delegate: self)
return
}
presentPurchaseScreen(forProduct: metadata.product, delegate: self)
} catch {
presentBetaFeatureUnavailable("Providers")
return
}

35
Passepartout/App/iOS/Scenes/ServiceViewController.swift
View File

@ -377,11 +377,19 @@ class ServiceViewController: UIViewController, StrongTableHost {
}
private func trustMobileNetwork(cell: ToggleTableViewCell) {
guard ProductManager.shared.isEligible(forFeature: .trustedNetworks) else {
do {
guard try ProductManager.shared.isEligible(forFeature: .trustedNetworks) else {
delay {
cell.setOn(false, animated: true)
}
presentPurchaseScreen(forProduct: .trustedNetworks)
return
}
} catch {
delay {
cell.setOn(false, animated: true)
}
presentPurchaseScreen(forProduct: .trustedNetworks)
presentBetaFeatureUnavailable("Trusted networks")
return
}
@ -394,8 +402,13 @@ class ServiceViewController: UIViewController, StrongTableHost {
}
private func trustCurrentWiFi() {
guard ProductManager.shared.isEligible(forFeature: .trustedNetworks) else {
presentPurchaseScreen(forProduct: .trustedNetworks)
do {
guard try ProductManager.shared.isEligible(forFeature: .trustedNetworks) else {
presentPurchaseScreen(forProduct: .trustedNetworks)
return
}
} catch {
presentBetaFeatureUnavailable("Trusted networks")
return
}
@ -447,14 +460,22 @@ class ServiceViewController: UIViewController, StrongTableHost {
}
private func toggleTrustWiFi(cell: ToggleTableViewCell, at row: Int) {
guard ProductManager.shared.isEligible(forFeature: .trustedNetworks) else {
do {
guard try ProductManager.shared.isEligible(forFeature: .trustedNetworks) else {
delay {
cell.setOn(false, animated: true)
}
presentPurchaseScreen(forProduct: .trustedNetworks)
return
}
} catch {
delay {
cell.setOn(false, animated: true)
}
presentPurchaseScreen(forProduct: .trustedNetworks)
presentBetaFeatureUnavailable("Trusted networks")
return
}
if cell.isOn {
trustedNetworks.enableWifi(at: row)
} else {

12
Passepartout/Core/Sources/Model/ProductManager.swift
View File

@ -32,6 +32,10 @@ import TunnelKit
private let log = SwiftyBeaver.self
public enum ProductError: Error {
case beta
}
public class ProductManager: NSObject {
public struct Configuration {
public let isBetaFullVersion: Bool
@ -155,16 +159,16 @@ public class ProductManager: NSObject {
return purchasedFeatures.contains(.fullVersion)
}
public func isEligible(forFeature feature: Product) -> Bool {
public func isEligible(forFeature feature: Product) throws -> Bool {
guard !isBeta else {
return false
throw ProductError.beta
}
return isFullVersion() || purchasedFeatures.contains(feature)
}
public func isEligible(forProvider metadata: Infrastructure.Metadata) -> Bool {
public func isEligible(forProvider metadata: Infrastructure.Metadata) throws -> Bool {
guard !isBeta else {
return false
throw ProductError.beta
}
return isFullVersion() || purchasedFeatures.contains(metadata.product)
}