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

Merge pull request #4 from keeshux/optional-account 

Optional account
This commit is contained in:
Davide De Rosa 2018-10-19 02:22:17 +02:00 committed by GitHub
parent 76cf7ba8d5 ae2bd3d876
commit 67de4ea3d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Passepartout-iOS/Scenes/ServiceViewController.swift
View File

@ -190,10 +190,10 @@ class ServiceViewController: UIViewController, TableModelHost {
private func toggleVpnService(cell: ToggleTableViewCell) {
if cell.isOn {
guard service.canActivate(uncheckedProfile) else {
guard !service.needsCredentials(for: uncheckedProfile) else {
let alert = Macros.alert(
L10n.Service.Sections.Vpn.header,
L10n.Service.Alerts.ConfigurationNeeded.message
L10n.Service.Alerts.CredentialsNeeded.message
)
alert.addCancelAction(L10n.Global.ok) {
cell.setOn(false, animated: true)
@ -522,7 +522,7 @@ extension ServiceViewController: UITableViewDataSource, UITableViewDelegate, Tog
cell.applyVPN(Theme.current, with: vpn.isEnabled ? vpn.status : nil)
cell.leftText = L10n.Service.Cells.ConnectionStatus.caption
cell.accessoryType = .none
cell.isTappable = service.canActivate(uncheckedProfile) && vpn.isEnabled
cell.isTappable = !service.needsCredentials(for: uncheckedProfile) && vpn.isEnabled
return cell
case .useProfile:

2
Passepartout/Resources/en.lproj/Localizable.strings
View File

@ -98,7 +98,7 @@
"service.cells.data_count.caption" = "Exchanged bytes count";
"service.cells.debug_log.caption" = "Debug log";
"service.alerts.configuration_needed.message" = "You need to finish configuration first.";
"service.alerts.credentials_needed.message" = "You need to enter account credentials first.";
"service.alerts.reconnect_vpn.message" = "Do you want to reconnect to the VPN?";
"service.alerts.trusted.no_network.message" = "You are not connected to any Wi-Fi network.";
"service.alerts.trusted.will_disconnect_trusted.message" = "By trusting this network, the VPN may be disconnected. Continue?";

6
Passepartout/Sources/ApplicationError.swift
View File

@ -30,12 +30,6 @@ enum ApplicationError: Error {
case missingCredentials
case providerPool
case providerPreset
case hostEndpoints
case missingCA
case emptyRemotes

2
Passepartout/Sources/Model/ConnectionProfile.swift
View File

@ -34,7 +34,7 @@ protocol ConnectionProfile: class, EndpointDataSource {
var username: String? { get set }
var isConfigured: Bool { get }
var requiresCredentials: Bool { get }
func generate(from configuration: TunnelKitProvider.Configuration, preferences: Preferences) throws -> TunnelKitProvider.Configuration
}

13
Passepartout/Sources/Model/ConnectionService.swift
View File

@ -180,21 +180,20 @@ class ConnectionService: Codable {
return profile.id == activeProfileId
}
func canActivate(_ profile: ConnectionProfile) -> Bool {
return profile.isConfigured && hasCredentials(for: profile)
}
func activateProfile(_ profile: ConnectionProfile) {
activeProfileId = profile.id
}
// MARK: Credentials
func hasCredentials(for profile: ConnectionProfile) -> Bool {
guard let creds = credentials(for: profile) else {
func needsCredentials(for profile: ConnectionProfile) -> Bool {
guard profile.requiresCredentials else {
return false
}
return !creds.isEmpty
guard let creds = credentials(for: profile) else {
return true
}
return creds.isEmpty
}
func credentials(for profile: ConnectionProfile) -> Credentials? {

8
Passepartout/Sources/Model/Profiles/HostConnectionProfile.swift
View File

@ -47,14 +47,12 @@ class HostConnectionProfile: ConnectionProfile, Codable, Equatable {
var username: String?
var isConfigured: Bool {
return !parameters.endpointProtocols.isEmpty
var requiresCredentials: Bool {
return false
}
func generate(from configuration: TunnelKitProvider.Configuration, preferences: Preferences) throws -> TunnelKitProvider.Configuration {
guard !parameters.endpointProtocols.isEmpty else {
throw ApplicationError.hostEndpoints
}
precondition(!parameters.endpointProtocols.isEmpty)
// XXX: copy paste, error prone
var builder = parameters.builder()

12
Passepartout/Sources/Model/Profiles/ProviderConnectionProfile.swift
View File

@ -40,7 +40,7 @@ class ProviderConnectionProfile: ConnectionProfile, Codable, Equatable {
}
var pool: Pool? {
return infrastructure.pool(for: poolId)
return infrastructure.pool(for: poolId) ?? infrastructure.pool(for: infrastructure.defaults.pool)
}
var presetId: String {
@ -101,16 +101,16 @@ class ProviderConnectionProfile: ConnectionProfile, Codable, Equatable {
var username: String?
var isConfigured: Bool {
return (pool != nil) && (preset != nil)
var requiresCredentials: Bool {
return true
}
func generate(from configuration: TunnelKitProvider.Configuration, preferences: Preferences) throws -> TunnelKitProvider.Configuration {
guard let pool = pool else {
throw ApplicationError.providerPool
preconditionFailure("Nil pool?")
}
guard let preset = preset else {
throw ApplicationError.providerPreset
preconditionFailure("Nil preset?")
}
// assert(!pool.numericAddresses.isEmpty)

6
Passepartout/Sources/SwiftGen+Strings.swift
View File

@ -423,9 +423,9 @@ internal enum L10n {
internal enum Alerts {
internal enum ConfigurationNeeded {
/// You need to finish configuration first.
internal static let message = L10n.tr("Localizable", "service.alerts.configuration_needed.message")
internal enum CredentialsNeeded {
/// You need to enter account credentials first.
internal static let message = L10n.tr("Localizable", "service.alerts.credentials_needed.message")
}
internal enum DataCount {

2
Podfile.lock
View File

@ -40,4 +40,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: f6888fe9e046f88d139af75dd5308916c5be8b7b
COCOAPODS: 1.6.0.beta.1
COCOAPODS: 1.6.0.beta.2