From f335440800183620d340158c97721118e0b5d603 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Mon, 25 Feb 2019 23:13:12 +0100 Subject: [PATCH] Shut down if server pushes a compression directive --- CHANGELOG.md | 6 ++++++ Passepartout-iOS/Global/Theme+Cells.swift | 3 +++ Passepartout/Resources/en.lproj/Localizable.strings | 1 + Passepartout/Sources/SwiftGen+Strings.swift | 2 ++ Podfile | 2 +- Podfile.lock | 8 ++++---- 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 647919ad..2e9d954b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased + +### Added + +- Shut down if server pushes a compression directive. + ## 1.0.1 beta 1299 (2019-02-25) ### Added diff --git a/Passepartout-iOS/Global/Theme+Cells.swift b/Passepartout-iOS/Global/Theme+Cells.swift index 1f9fab32..032d8c23 100644 --- a/Passepartout-iOS/Global/Theme+Cells.swift +++ b/Passepartout-iOS/Global/Theme+Cells.swift @@ -103,6 +103,9 @@ extension SettingTableViewCell { case .encryptionInitialization, .encryptionData: disconnectionReason = L10n.Vpn.Errors.encryption + case .serverCompression: + disconnectionReason = L10n.Vpn.Errors.compression + case .networkChanged: disconnectionReason = L10n.Vpn.Errors.network diff --git a/Passepartout/Resources/en.lproj/Localizable.strings b/Passepartout/Resources/en.lproj/Localizable.strings index 8b9eda5d..8c3bb1ea 100644 --- a/Passepartout/Resources/en.lproj/Localizable.strings +++ b/Passepartout/Resources/en.lproj/Localizable.strings @@ -176,6 +176,7 @@ "vpn.errors.auth" = "Auth failed"; "vpn.errors.tls" = "TLS failed"; "vpn.errors.encryption" = "Encryption failed"; +"vpn.errors.compression" = "Compression unsupported"; "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 4bbcc2c7..65b9fde3 100644 --- a/Passepartout/Sources/SwiftGen+Strings.swift +++ b/Passepartout/Sources/SwiftGen+Strings.swift @@ -659,6 +659,8 @@ internal enum L10n { internal enum Errors { /// Auth failed internal static let auth = L10n.tr("Localizable", "vpn.errors.auth") + /// Compression unsupported + internal static let compression = L10n.tr("Localizable", "vpn.errors.compression") /// DNS failed internal static let dns = L10n.tr("Localizable", "vpn.errors.dns") /// Encryption failed diff --git a/Podfile b/Podfile index eaa8b7df..b494b98e 100644 --- a/Podfile +++ b/Podfile @@ -3,7 +3,7 @@ use_frameworks! def shared_pods #pod 'TunnelKit', '~> 1.4.0' - pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '8429596' + pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '06a872c' #pod 'TunnelKit', :path => '../../personal/tunnelkit' end diff --git a/Podfile.lock b/Podfile.lock index 5f9f43ee..ac352d16 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -14,7 +14,7 @@ PODS: DEPENDENCIES: - MBProgressHUD - - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `8429596`) + - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `06a872c`) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -24,12 +24,12 @@ SPEC REPOS: EXTERNAL SOURCES: TunnelKit: - :commit: '8429596' + :commit: 06a872c :git: https://github.com/keeshux/tunnelkit CHECKOUT OPTIONS: TunnelKit: - :commit: '8429596' + :commit: 06a872c :git: https://github.com/keeshux/tunnelkit SPEC CHECKSUMS: @@ -38,6 +38,6 @@ SPEC CHECKSUMS: SwiftyBeaver: 8e67ab3cd94389cbbb7a9c7cc02748d98bfee68e TunnelKit: 8e287cd252b2f99069741d385f3d54a9687d507d -PODFILE CHECKSUM: 99d314b581d9082f315c39e524ddbdc78b2d3de6 +PODFILE CHECKSUM: 6d49c6507811106cabec6b6ec69b29e2101a55bc COCOAPODS: 1.6.1