Commit 3b7cc244 authored by Jose Blaya's avatar Jose Blaya
Browse files

Merge branch 'release/2.8.0' into release/3.0.0

# Conflicts:
#	Podfile
#	Podfile.lock
parents ea9be7ce ee1ea337
......@@ -29,8 +29,8 @@ struct AppConstants {
}
struct InApp {
static let yearlyProductIdentifier = "com.privateinternetaccess.ios.iap.2019.1year"
static let monthlyProductIdentifier = "com.privateinternetaccess.ios.iap.2019.1month"
static let yearlyProductIdentifier = "com.privateinternetaccess.ios.iap.1year"
static let monthlyProductIdentifier = "com.privateinternetaccess.ios.iap.1month"
}
struct LegacyInApp {
......
......@@ -37,7 +37,7 @@ class AppPreferences {
static let shared = AppPreferences()
private static let currentVersion = "5.2"
private static let currentVersion = "5.3"
private let defaults: UserDefaults
......
......@@ -399,6 +399,8 @@ class SettingsViewController: AutolayoutViewController {
pendingPreferences.mace = false
}
pendingVPNAction = pendingPreferences.requiredVPNAction()
guard let action = pendingVPNAction else {
commitPreferences()
completionHandler()
......@@ -488,6 +490,7 @@ class SettingsViewController: AutolayoutViewController {
pendingPreferences.availableNetworks = Client.preferences.availableNetworks
pendingPreferences.shouldConnectForAllNetworks = Client.preferences.shouldConnectForAllNetworks
pendingPreferences.useWiFiProtection = Client.preferences.useWiFiProtection
pendingPreferences.trustCellularData = Client.preferences.trustCellularData
pendingPreferences.commit()
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment