Skip to content

Commit ee68bf9

Browse files
committed
Fix conncheck to work on staging environment
1 parent 8714b80 commit ee68bf9

File tree

5 files changed

+24
-9
lines changed

5 files changed

+24
-9
lines changed

ios/Configurations/Api.xcconfig.template

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
API_HOST_NAME[config=Debug] = api.mullvad.net
2-
API_HOST_NAME[config=Release] = api.mullvad.net
3-
API_HOST_NAME[config=MockRelease] = api.mullvad.net
4-
API_HOST_NAME[config=Staging] = api.stagemole.eu
1+
HOST_NAME[config=Debug] = mullvad.net
2+
HOST_NAME[config=Release] = mullvad.net
3+
HOST_NAME[config=MockRelease] = mullvad.net
4+
HOST_NAME[config=Staging] = stagemole.eu
5+
6+
API_HOST_NAME[config=Debug] = api.$(HOST_NAME)
7+
API_HOST_NAME[config=Release] = api.$(HOST_NAME)
8+
API_HOST_NAME[config=MockRelease] = api.$(HOST_NAME)
9+
API_HOST_NAME[config=Staging] = api.$(HOST_NAME)
510

611
API_ENDPOINT[config=Debug] = 45.83.223.196:443
712
API_ENDPOINT[config=Release] = 45.83.223.196:443

ios/MullvadVPN/GeneralAPIs/OutgoingConnectionProxy.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ final class OutgoingConnectionProxy: OutgoingConnectionHandling {
2121
case v4 = "ipv4", v6 = "ipv6"
2222

2323
var host: String {
24-
"\(rawValue).am.i.mullvad.net"
24+
"\(rawValue).am.i.\(ApplicationConfiguration.hostName)"
2525
}
2626
}
2727

ios/MullvadVPN/Supporting Files/Info.plist

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>HostName</key>
6+
<string>$(HOST_NAME)</string>
57
<key>NSLocalNetworkUsageDescription</key>
68
<string>The app needs this to connect and test a new method.</string>
79
<key>ApplicationSecurityGroupIdentifier</key>

ios/PacketTunnel/Info.plist

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>HostName</key>
6+
<string>$(HOST_NAME)</string>
57
<key>ApplicationSecurityGroupIdentifier</key>
68
<string>$(SECURITY_GROUP_IDENTIFIER)</string>
79
<key>MainApplicationIdentifier</key>

ios/Shared/ApplicationConfiguration.swift

+10-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,14 @@
99
import Foundation
1010
import Network
1111

12+
// swiftlint:disable force_cast
1213
enum ApplicationConfiguration {
14+
static var hostName: String {
15+
Bundle.main.object(forInfoDictionaryKey: "HostName") as! String
16+
}
17+
1318
/// Shared container security group identifier.
1419
static var securityGroupIdentifier: String {
15-
// swiftlint:disable:next force_cast
1620
Bundle.main.object(forInfoDictionaryKey: "ApplicationSecurityGroupIdentifier") as! String
1721
}
1822

@@ -59,14 +63,16 @@ enum ApplicationConfiguration {
5963
static let logMaximumFileSize: UInt64 = 131_072 // 128 kB.
6064

6165
/// Privacy policy URL.
62-
static let privacyPolicyURL = URL(string: "https://mullvad.net/help/privacy-policy/")!
66+
static let privacyPolicyURL = URL(string: "https://\(Self.hostName)/help/privacy-policy/")!
6367

6468
/// Make a start regarding policy URL.
65-
static let privacyGuidesURL = URL(string: "https://mullvad.net/help/first-steps-towards-online-privacy/")!
69+
static let privacyGuidesURL = URL(string: "https://\(Self.hostName)/help/first-steps-towards-online-privacy/")!
6670

6771
/// FAQ & Guides URL.
68-
static let faqAndGuidesURL = URL(string: "https://mullvad.net/help/tag/mullvad-app/")!
72+
static let faqAndGuidesURL = URL(string: "https://\(Self.hostName)/help/tag/mullvad-app/")!
6973

7074
/// Maximum number of devices per account.
7175
static let maxAllowedDevices = 5
7276
}
77+
78+
// swiftlint:enable force_cast

0 commit comments

Comments
 (0)