Merge pull request #45 from passepartoutvpn/integrate-mullvad

Integrate Mullvad provider

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Configure masking in debug log for improved diagnostics.
+- Mullvad provider. [#45](https://github.com/passepartoutvpn/passepartout-ios/pull/45)
 
 ## 1.1.0 (2019-03-22)
 

Passepartout-iOS/Scenes/AccountViewController.swift

@@ -59,6 +59,9 @@ class AccountViewController: UIViewController, TableModelHost {
                 
             case .tunnelBear:
                 guidance = V.Infrastructure.tunnelbear
+
+            case .mullvad:
+                guidance = V.Infrastructure.mullvad
             }
 
             if guidance != nil {

Passepartout/Resources/en.lproj/Localizable.strings

@@ -132,6 +132,7 @@
 //"account.cells.password_confirm.mismatch" = "Passwords don't match!";
 "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.mullvad" = "Use your website account number and password \"m\".";
 "account.suggestion_footer.referral" = "Don't have an account? Tap here to get one.";
 
 "endpoint.sections.location_addresses.header" = "Addresses";

Passepartout/Sources/AppConstants.swift

@@ -166,7 +166,8 @@ public class AppConstants {
         
         public static let referrals: [Infrastructure.Name: String] = [
             .pia: "https://www.privateinternetaccess.com/pages/buy-vpn/",
-            .tunnelBear: "https://click.tunnelbear.com/aff_c?offer_id=2&aff_id=7464"
+            .tunnelBear: "https://click.tunnelbear.com/aff_c?offer_id=2&aff_id=7464",
+            .mullvad: "https://mullvad.net/en/account/create/"
         ]
     }
 

Passepartout/Sources/Services/Infrastructure.swift

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

Passepartout/Sources/Services/InfrastructureFactory.swift

@@ -55,9 +55,11 @@ public class InfrastructureFactory {
     
     public static let shared = InfrastructureFactory()
 
+    // manually pre-sorted
     public let allNames: [Infrastructure.Name] = [
+        .mullvad,
         .pia,
-        .tunnelBear
+        .tunnelBear,
     ]
     
     private let bundle: [Infrastructure.Name: Infrastructure]

Passepartout/Sources/SwiftGen+Strings.swift

@@ -84,6 +84,8 @@ public enum L10n {
       /// Don't have an account? Tap here to get one.
       public static let referral = L10n.tr("Localizable", "account.suggestion_footer.referral")
       public enum Infrastructure {
+        /// Use your website account number and password "m".
+        public static let mullvad = L10n.tr("Localizable", "account.suggestion_footer.infrastructure.mullvad")
         /// Use your website credentials. Your username is usually numeric with a "p" prefix.
         public static let pia = L10n.tr("Localizable", "account.suggestion_footer.infrastructure.pia")
         /// Use your website credentials. Your username is usually your email.