diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2022-06-02 13:35:40 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2022-06-02 13:35:40 +0200 |
| commit | 1fdd7fa17567b72ab47c8f4a2bf34bdf6a6ad1e7 (patch) | |
| tree | 3a5b7b2404556f6c7a7d4e691ea2ea799412e574 /ios/MullvadVPN | |
| parent | e6714d142bb5d08c49d1f19884ea9bfd7d25290f (diff) | |
| parent | 29ebb186fd6562a17fa530f271776922ca27646d (diff) | |
| download | mullvadvpn-1fdd7fa17567b72ab47c8f4a2bf34bdf6a6ad1e7.tar.xz mullvadvpn-1fdd7fa17567b72ab47c8f4a2bf34bdf6a6ad1e7.zip | |
Merge branch 'code-signing'
Diffstat (limited to 'ios/MullvadVPN')
| -rw-r--r-- | ios/MullvadVPN/ApplicationConfiguration.swift | 20 | ||||
| -rw-r--r-- | ios/MullvadVPN/Info.plist | 2 | ||||
| -rw-r--r-- | ios/MullvadVPN/MullvadVPN.entitlements | 2 |
3 files changed, 17 insertions, 7 deletions
diff --git a/ios/MullvadVPN/ApplicationConfiguration.swift b/ios/MullvadVPN/ApplicationConfiguration.swift index 17bd6f04a1..6c6acbe05c 100644 --- a/ios/MullvadVPN/ApplicationConfiguration.swift +++ b/ios/MullvadVPN/ApplicationConfiguration.swift @@ -9,14 +9,20 @@ import Foundation import struct Network.IPv4Address -enum ApplicationConfiguration {} +class ApplicationConfiguration { + /// Shared container security group identifier. + static var securityGroupIdentifier: String { + let securityGroupIdentifier = Bundle(for: Self.self) + .object(forInfoDictionaryKey: "ApplicationSecurityGroupIdentifier") as? String + return securityGroupIdentifier! + } -extension ApplicationConfiguration { - /// The application group identifier used for sharing application preferences between processes - static let securityGroupIdentifier = "group.net.mullvad.MullvadVPN" + /// The application identifier for packet tunnel extension. + static var packetTunnelExtensionIdentifier: String { + let mainBundleIdentifier = Bundle.main.bundleIdentifier! - /// The application identifier for the PacketTunnel extension - static let packetTunnelExtensionIdentifier = "net.mullvad.MullvadVPN.PacketTunnel" + return "\(mainBundleIdentifier).PacketTunnel" + } /// Container URL for security group static var containerURL: URL? { @@ -64,4 +70,6 @@ extension ApplicationConfiguration { /// API address background task identifier static let addressCacheUpdateTaskIdentifier = "net.mullvad.MullvadVPN.AddressCacheUpdate" + + private init() {} } diff --git a/ios/MullvadVPN/Info.plist b/ios/MullvadVPN/Info.plist index d4f8f9020f..4c782bc735 100644 --- a/ios/MullvadVPN/Info.plist +++ b/ios/MullvadVPN/Info.plist @@ -2,6 +2,8 @@ <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> + <key>ApplicationSecurityGroupIdentifier</key> + <string>$(SECURITY_GROUP_IDENTIFIER)</string> <key>BGTaskSchedulerPermittedIdentifiers</key> <array> <string>net.mullvad.MullvadVPN.AppRefresh</string> diff --git a/ios/MullvadVPN/MullvadVPN.entitlements b/ios/MullvadVPN/MullvadVPN.entitlements index a34daec96d..4b3f467000 100644 --- a/ios/MullvadVPN/MullvadVPN.entitlements +++ b/ios/MullvadVPN/MullvadVPN.entitlements @@ -8,7 +8,7 @@ </array> <key>com.apple.security.application-groups</key> <array> - <string>group.net.mullvad.MullvadVPN</string> + <string>$(SECURITY_GROUP_IDENTIFIER)</string> </array> </dict> </plist> |