From 3b1b34f15cf49810678dd61f6d5cdfe030f863b7 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Fri, 19 Apr 2019 09:48:24 +0200 Subject: [PATCH] Detect missing VPN routing info --- Passepartout-iOS/Global/Theme+Cells.swift | 3 +++ Passepartout/Resources/en.lproj/Localizable.strings | 1 + Passepartout/Resources/it.lproj/Localizable.strings | 1 + Passepartout/Sources/SwiftGen+Strings.swift | 2 ++ Podfile | 4 ++-- Podfile.lock | 10 +++++----- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Passepartout-iOS/Global/Theme+Cells.swift b/Passepartout-iOS/Global/Theme+Cells.swift index c02abc98..06181bf7 100644 --- a/Passepartout-iOS/Global/Theme+Cells.swift +++ b/Passepartout-iOS/Global/Theme+Cells.swift @@ -117,6 +117,9 @@ extension SettingTableViewCell { case .networkChanged: disconnectionReason = L10n.Vpn.Errors.network + case .routing: + disconnectionReason = L10n.Vpn.Errors.routing + default: break } diff --git a/Passepartout/Resources/en.lproj/Localizable.strings b/Passepartout/Resources/en.lproj/Localizable.strings index 09fb40e9..01e72f57 100644 --- a/Passepartout/Resources/en.lproj/Localizable.strings +++ b/Passepartout/Resources/en.lproj/Localizable.strings @@ -221,6 +221,7 @@ "vpn.errors.encryption" = "Encryption failed"; "vpn.errors.compression" = "Compression unsupported"; "vpn.errors.network" = "Network changed"; +"vpn.errors.routing" = "Missing routing"; "issue_reporter.title" = "Report issue"; "issue_reporter.message" = "The debug log of your latest connections is crucial to resolve your connectivity issues and is completely anonymous.\n\nThe .ovpn configuration file, if any, is attached stripped of any sensitive data.\n\nPlease double check the e-mail attachments if unsure."; diff --git a/Passepartout/Resources/it.lproj/Localizable.strings b/Passepartout/Resources/it.lproj/Localizable.strings index 94e445f1..d83afaa2 100644 --- a/Passepartout/Resources/it.lproj/Localizable.strings +++ b/Passepartout/Resources/it.lproj/Localizable.strings @@ -221,6 +221,7 @@ "vpn.errors.encryption" = "Crittografia fallita"; "vpn.errors.compression" = "Compressione non supportata"; "vpn.errors.network" = "Rete cambiata"; +"vpn.errors.routing" = "Routing mancante"; "issue_reporter.title" = "Segnala problema"; "issue_reporter.message" = "Il debug log delle tue ultime connessioni è cruciale per risolvere i tuoi problemi di connettività ed è completamente anonimo.\n\nIl file di configurazione .ovpn, se presente, è allegato privato di ogni dato sensibile.\n\nPer favore controlla gli allegati dell'e-mail se non sei sicuro/a."; diff --git a/Passepartout/Sources/SwiftGen+Strings.swift b/Passepartout/Sources/SwiftGen+Strings.swift index 28c5f37a..b6104ac4 100644 --- a/Passepartout/Sources/SwiftGen+Strings.swift +++ b/Passepartout/Sources/SwiftGen+Strings.swift @@ -950,6 +950,8 @@ public enum L10n { public static let encryption = L10n.tr("Localizable", "vpn.errors.encryption") /// Network changed public static let network = L10n.tr("Localizable", "vpn.errors.network") + /// Missing routing + public static let routing = L10n.tr("Localizable", "vpn.errors.routing") /// Timeout public static let timeout = L10n.tr("Localizable", "vpn.errors.timeout") /// TLS failed diff --git a/Podfile b/Podfile index 29f7604c..b9419025 100644 --- a/Podfile +++ b/Podfile @@ -5,8 +5,8 @@ use_frameworks! def shared_pods #pod 'TunnelKit', '~> 1.6.2' #pod 'TunnelKit/LZO', '~> 1.6.2' - pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => 'c565e32' - pod 'TunnelKit/LZO', :git => 'https://github.com/keeshux/tunnelkit', :commit => 'c565e32' + pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '9b8be02' + pod 'TunnelKit/LZO', :git => 'https://github.com/keeshux/tunnelkit', :commit => '9b8be02' #pod 'TunnelKit', :path => '../../personal/tunnelkit' #pod 'TunnelKit/LZO', :path => '../../personal/tunnelkit' pod 'SSZipArchive' diff --git a/Podfile.lock b/Podfile.lock index 85df4096..9ba76325 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -17,8 +17,8 @@ PODS: DEPENDENCIES: - MBProgressHUD - SSZipArchive - - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `c565e32`) - - TunnelKit/LZO (from `https://github.com/keeshux/tunnelkit`, commit `c565e32`) + - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `9b8be02`) + - TunnelKit/LZO (from `https://github.com/keeshux/tunnelkit`, commit `9b8be02`) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -29,12 +29,12 @@ SPEC REPOS: EXTERNAL SOURCES: TunnelKit: - :commit: c565e32 + :commit: 9b8be02 :git: https://github.com/keeshux/tunnelkit CHECKOUT OPTIONS: TunnelKit: - :commit: c565e32 + :commit: 9b8be02 :git: https://github.com/keeshux/tunnelkit SPEC CHECKSUMS: @@ -44,6 +44,6 @@ SPEC CHECKSUMS: SwiftyBeaver: 4cc0080d2e23f980652e28978db11a5c9da39165 TunnelKit: a0b7eb151ae6d30788623df94d682ed90706940a -PODFILE CHECKSUM: 0cff706698244d63ddab549282937a9e7ba9ff09 +PODFILE CHECKSUM: dfd624715692f5c8fbd5863daa3773e815a88507 COCOAPODS: 1.6.1