diff options
| author | Bug Magnet <marco.nikic@mullvad.net> | 2023-10-05 10:26:03 +0200 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2023-10-05 10:26:03 +0200 |
| commit | ae5887982d8878d9850a14d04a5edec3f0ab844e (patch) | |
| tree | a9c18a4b2acdb207cbc24dc724baec5a0dceb4e7 | |
| parent | cfde812c6b3b0d3e4545d79d37fa4f3a5e7d241f (diff) | |
| parent | 6bcff8c937ccb8629ce1c8f5dfae3373675fc265 (diff) | |
| download | mullvadvpn-ae5887982d8878d9850a14d04a5edec3f0ab844e.tar.xz mullvadvpn-ae5887982d8878d9850a14d04a5edec3f0ab844e.zip | |
Merge branch 'fix-social-media-dns-block-setting-ios-329'
| -rw-r--r-- | ios/MullvadVPN/View controllers/Preferences/PreferencesViewModel.swift | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ios/MullvadVPN/View controllers/Preferences/PreferencesViewModel.swift b/ios/MullvadVPN/View controllers/Preferences/PreferencesViewModel.swift index fbfd5f53df..a429f1f36d 100644 --- a/ios/MullvadVPN/View controllers/Preferences/PreferencesViewModel.swift +++ b/ios/MullvadVPN/View controllers/Preferences/PreferencesViewModel.swift @@ -139,7 +139,8 @@ struct PreferencesViewModel: Equatable { /// Precondition for enabling Custom DNS. var customDNSPrecondition: CustomDNSPrecondition { - if blockAdvertising || blockTracking || blockMalware || blockAdultContent || blockGambling { + if blockAdvertising || blockTracking || blockMalware || + blockAdultContent || blockGambling || blockSocialMedia { return .conflictsWithOtherSettings } else { let hasValidDNSDomains = customDNSDomains.contains { entry in |