summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBug Magnet <marco.nikic@mullvad.net>2024-11-11 15:23:09 +0100
committerBug Magnet <marco.nikic@mullvad.net>2024-11-26 11:03:54 +0100
commit0dfccf7cae9fd6107633b82bf74efffb04d5189e (patch)
tree8d9e0b13903314d3397feaac5fb5b86a24fa6101
parente6fe960ac7e7e9087efc0e82a61c16c2cea107fe (diff)
downloadmullvadvpn-0dfccf7cae9fd6107633b82bf74efffb04d5189e.tar.xz
mullvadvpn-0dfccf7cae9fd6107633b82bf74efffb04d5189e.zip
Disable testAppStillFunctioningWhenAPIDown because of ATS in iOS 18
-rw-r--r--ios/MullvadVPNUITests/ConnectivityTests.swift6
-rw-r--r--mullvad-ios/src/encrypted_dns_proxy.rs2
2 files changed, 7 insertions, 1 deletions
diff --git a/ios/MullvadVPNUITests/ConnectivityTests.swift b/ios/MullvadVPNUITests/ConnectivityTests.swift
index a1a49ffd8e..6b66a2d514 100644
--- a/ios/MullvadVPNUITests/ConnectivityTests.swift
+++ b/ios/MullvadVPNUITests/ConnectivityTests.swift
@@ -143,6 +143,12 @@ class ConnectivityTests: LoggedOutUITestCase {
// swiftlint:disable function_body_length
/// Test that the app is functioning when API is down. To simulate API being down we create a dummy access method
func testAppStillFunctioningWhenAPIDown() throws {
+ let skipReason = """
+ This test is currently skipped due to a bug in iOS 18 where ATS shuts down the
+ connection to the API in the blocked state, despite being explicitly disabled,
+ and after the checks in SSLPinningURLSessionDelegate return no error.
+ """
+ try XCTSkipIf(true, skipReason)
let hasTimeAccountNumber = getAccountWithTime()
addTeardownBlock {
diff --git a/mullvad-ios/src/encrypted_dns_proxy.rs b/mullvad-ios/src/encrypted_dns_proxy.rs
index 3c89faf895..2aa83d833d 100644
--- a/mullvad-ios/src/encrypted_dns_proxy.rs
+++ b/mullvad-ios/src/encrypted_dns_proxy.rs
@@ -95,8 +95,8 @@ impl EncryptedDnsProxyState {
pub unsafe extern "C" fn encrypted_dns_proxy_init(
domain_name: *const c_char,
) -> *mut EncryptedDnsProxyState {
- // SAFETY: domain_name points to a valid region of memory and contains a nul terminator.
let domain = {
+ // SAFETY: domain_name points to a valid region of memory and contains a nul terminator.
let c_str = unsafe { CStr::from_ptr(domain_name) };
String::from_utf8_lossy(c_str.to_bytes())
};