Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Follow desktop copy for DNS warnings #6495

Merged
merged 1 commit into from
Jul 26, 2024
Merged

Follow desktop copy for DNS warnings #6495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ios/MullvadVPN/View controllers/VPNSettings/CustomDNSCellFactory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ final class CustomDNSCellFactory: CellFactoryProtocol {
cell.titleLabel.text = NSLocalizedString(
"CUSTOM_DNS_CELL_LABEL",
tableName: "VPNSettings",
value: "Use custom DNS",
value: "Use custom DNS server",
comment: ""
)
cell.setEnabled(viewModel.customDNSPrecondition == .satisfied)
Expand Down
3 changes: 2 additions & 1 deletion ios/MullvadVPN/View controllers/VPNSettings/CustomDNSViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,9 @@ extension CustomDNSViewController: DNSSettingsDataSourceDelegate {
value: """
When this feature is enabled it stops the device from contacting certain \
domains or websites known for distributing ads, malware, trackers and more. \

This might cause issues on certain websites, services, and apps.
Attention: this setting cannot be used in combination with **Use custom DNS**.
Attention: this setting cannot be used in combination with **Use custom DNS server**.
""",
comment: ""
), options: MarkdownStylingOptions(font: .preferredFont(forTextStyle: .body)))
Expand Down
Loading