diff --git a/Passepartout-iOS/Scenes/AccountViewController.swift b/Passepartout-iOS/Scenes/AccountViewController.swift index 5f5f45b3..c9b1e95c 100644 --- a/Passepartout-iOS/Scenes/AccountViewController.swift +++ b/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 { diff --git a/Passepartout/Resources/en.lproj/Localizable.strings b/Passepartout/Resources/en.lproj/Localizable.strings index 27c8c38e..c8f74c99 100644 --- a/Passepartout/Resources/en.lproj/Localizable.strings +++ b/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"; diff --git a/Passepartout/Sources/Services/Infrastructure.swift b/Passepartout/Sources/Services/Infrastructure.swift index 786f8e85..4c609610 100644 --- a/Passepartout/Sources/Services/Infrastructure.swift +++ b/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() } diff --git a/Passepartout/Sources/Services/InfrastructureFactory.swift b/Passepartout/Sources/Services/InfrastructureFactory.swift index 33ef34e1..4a99ef1e 100644 --- a/Passepartout/Sources/Services/InfrastructureFactory.swift +++ b/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] diff --git a/Passepartout/Sources/SwiftGen+Strings.swift b/Passepartout/Sources/SwiftGen+Strings.swift index 2f11e4ae..93060e80 100644 --- a/Passepartout/Sources/SwiftGen+Strings.swift +++ b/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.