Merge branch 'integrate-windscribe'

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
+
+- Windscribe provider. [#39](https://github.com/passepartoutvpn/passepartout-ios/issues/39)
+
 ## 1.2.0 (2019-04-01)
 
 ### Added

Passepartout-iOS/Scenes/AccountViewController.swift

@@ -95,6 +95,9 @@ class AccountViewController: UIViewController, TableModelHost {
                 
             case .tunnelBear:
                 guidance = V.Infrastructure.tunnelbear
+                
+            case .windscribe:
+                guidance = V.Infrastructure.windscribe
             }
 
             model.add(.noAccount)

Passepartout/Resources/en.lproj/Localizable.strings

@@ -137,6 +137,7 @@
 "account.suggestion_footer.infrastructure.mullvad" = "Use your website account number and password \"m\".";
 "account.suggestion_footer.infrastructure.pia" = "Use your website credentials. Your username is usually numeric with a \"p\" prefix.";
 "account.suggestion_footer.infrastructure.tunnelbear" = "Use your website credentials. Your username is usually your email.";
+"account.suggestion_footer.infrastructure.windscribe" = "Find your credentials in the OpenVPN Config Generator on the website.";
 "account.suggestion_footer.guidance_link" = "Tap to open web page.";
 "account.suggestion_footer.referral" = "Don't have an account? Tap here to get one.";
 

Passepartout/Sources/AppConstants.swift

@@ -164,7 +164,9 @@ public class AppConstants {
             return URL(string: "https://itunes.apple.com/app/id\(id)?action=write-review")!
         }
         
-        public static let guidances: [Infrastructure.Name: String] = [:]
+        public static let guidances: [Infrastructure.Name: String] = [
+            .windscribe: "https://windscribe.com/getconfig/openvpn"
+        ]
 
         public static let referrals: [Infrastructure.Name: String] = [
             .mullvad: "https://mullvad.net/en/account/create/",

Passepartout/Sources/Services/Infrastructure.swift

@@ -34,6 +34,8 @@ public struct Infrastructure: Codable {
         
         case tunnelBear = "TunnelBear"
         
+        case windscribe = "Windscribe"
+        
         public var webName: String {
             return rawValue.lowercased()
         }

Passepartout/Sources/Services/InfrastructureFactory.swift

@@ -60,6 +60,7 @@ public class InfrastructureFactory {
         .mullvad,
         .pia,
         .tunnelBear,
+        .windscribe
     ]
     
     private let bundle: [Infrastructure.Name: Infrastructure]

Passepartout/Sources/SwiftGen+Strings.swift

@@ -92,6 +92,8 @@ public enum L10n {
         public static let pia = L10n.tr("Localizable", "account.suggestion_footer.infrastructure.pia")
         /// Use your website credentials. Your username is usually your email.
         public static let tunnelbear = L10n.tr("Localizable", "account.suggestion_footer.infrastructure.tunnelbear")
+        /// Find your credentials in the OpenVPN Config Generator on the website.
+        public static let windscribe = L10n.tr("Localizable", "account.suggestion_footer.infrastructure.windscribe")
       }
     }
   }