From ebbba3a713cbc6f605329817f9d8c168e4d71346 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Tue, 23 Oct 2018 23:17:16 +0200 Subject: [PATCH] Update TunnelKit to handle new error codes --- Passepartout-iOS/Global/Theme+Cells.swift | 7 +++++-- Passepartout/Resources/en.lproj/Localizable.strings | 3 ++- Passepartout/Sources/SwiftGen+Strings.swift | 2 ++ Podfile | 2 +- Podfile.lock | 8 ++++---- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/Passepartout-iOS/Global/Theme+Cells.swift b/Passepartout-iOS/Global/Theme+Cells.swift index 9ea26f8d..ea2856e3 100644 --- a/Passepartout-iOS/Global/Theme+Cells.swift +++ b/Passepartout-iOS/Global/Theme+Cells.swift @@ -94,12 +94,15 @@ extension SettingTableViewCell { case .dnsFailure: disconnectionReason = L10n.Vpn.Errors.dns - case .tlsFailed: + case .tlsInitialization, .tlsServerVerification, .tlsHandshake: disconnectionReason = L10n.Vpn.Errors.tls - case .authenticationFailed: + case .authentication: disconnectionReason = L10n.Vpn.Errors.auth + case .encryptionInitialization, .encryptionData: + disconnectionReason = L10n.Vpn.Errors.encryption + case .networkChanged: disconnectionReason = L10n.Vpn.Errors.network diff --git a/Passepartout/Resources/en.lproj/Localizable.strings b/Passepartout/Resources/en.lproj/Localizable.strings index ea78fce1..252de860 100644 --- a/Passepartout/Resources/en.lproj/Localizable.strings +++ b/Passepartout/Resources/en.lproj/Localizable.strings @@ -165,9 +165,10 @@ "vpn.disabled" = "Disabled"; "vpn.errors.timeout" = "Timeout"; +"vpn.errors.dns" = "DNS failed"; "vpn.errors.auth" = "Auth failed"; "vpn.errors.tls" = "TLS failed"; -"vpn.errors.dns" = "DNS failed"; +"vpn.errors.encryption" = "Encryption failed"; "vpn.errors.network" = "Network changed"; "issue_reporter.title" = "Report issue"; diff --git a/Passepartout/Sources/SwiftGen+Strings.swift b/Passepartout/Sources/SwiftGen+Strings.swift index 1c0c017a..5de61c9a 100644 --- a/Passepartout/Sources/SwiftGen+Strings.swift +++ b/Passepartout/Sources/SwiftGen+Strings.swift @@ -720,6 +720,8 @@ internal enum L10n { internal static let auth = L10n.tr("Localizable", "vpn.errors.auth") /// DNS failed internal static let dns = L10n.tr("Localizable", "vpn.errors.dns") + /// Encryption failed + internal static let encryption = L10n.tr("Localizable", "vpn.errors.encryption") /// Network changed internal static let network = L10n.tr("Localizable", "vpn.errors.network") /// Timeout diff --git a/Podfile b/Podfile index bd4e2851..16769b8e 100644 --- a/Podfile +++ b/Podfile @@ -3,7 +3,7 @@ use_frameworks! def shared_pods #pod 'TunnelKit', '~> 1.1.2' - pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '9829475' + pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => 'f7bb3a3' #pod 'TunnelKit', :path => '../tunnelkit' end diff --git a/Podfile.lock b/Podfile.lock index cbf345b6..99aaaa6a 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -14,7 +14,7 @@ PODS: DEPENDENCIES: - MBProgressHUD - - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `9829475`) + - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `f7bb3a3`) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -24,12 +24,12 @@ SPEC REPOS: EXTERNAL SOURCES: TunnelKit: - :commit: '9829475' + :commit: f7bb3a3 :git: https://github.com/keeshux/tunnelkit CHECKOUT OPTIONS: TunnelKit: - :commit: '9829475' + :commit: f7bb3a3 :git: https://github.com/keeshux/tunnelkit SPEC CHECKSUMS: @@ -38,6 +38,6 @@ SPEC CHECKSUMS: SwiftyBeaver: ccfcdf85a04d429f1633f668650b0ce8020bda3a TunnelKit: 6c790dfbcb0042d6a5dfe2fda5b0eb5b895afaf1 -PODFILE CHECKSUM: 9054389b89f51fe7517cfecebde6520280df4799 +PODFILE CHECKSUM: f39e32152761feedf93ae76c3d769b002a2084af COCOAPODS: 1.6.0.beta.2