From 3cf404008dad4f5c8569c5024c08bccb9b0c7ff9 Mon Sep 17 00:00:00 2001 From: Andrew Bulhak Date: Mon, 10 Mar 2025 16:51:45 +0100 Subject: [PATCH] Decouple DNS server info from content-blockers UI expansion --- .../VPNSettings/CustomDNSDataSource.swift | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/ios/MullvadVPN/View controllers/VPNSettings/CustomDNSDataSource.swift b/ios/MullvadVPN/View controllers/VPNSettings/CustomDNSDataSource.swift index c4f22e7b44f2..d620e101be40 100644 --- a/ios/MullvadVPN/View controllers/VPNSettings/CustomDNSDataSource.swift +++ b/ios/MullvadVPN/View controllers/VPNSettings/CustomDNSDataSource.swift @@ -563,17 +563,13 @@ final class CustomDNSDataSource: UITableViewDiffableDataSource< ) -> NSDiffableDataSourceSnapshot { var snapshot = snapshot - if snapshot.itemIdentifiers(inSection: .contentBlockers).isEmpty { + if viewModel.customDNSPrecondition == .satisfied { snapshot.deleteItems([.dnsServerInfo]) } else { - if viewModel.customDNSPrecondition == .satisfied { - snapshot.deleteItems([.dnsServerInfo]) + if snapshot.itemIdentifiers(inSection: .customDNS).contains(.dnsServerInfo) { + snapshot.reloadItems([.dnsServerInfo]) } else { - if snapshot.itemIdentifiers(inSection: .customDNS).contains(.dnsServerInfo) { - snapshot.reloadItems([.dnsServerInfo]) - } else { - snapshot.appendItems([.dnsServerInfo], toSection: .customDNS) - } + snapshot.appendItems([.dnsServerInfo], toSection: .customDNS) } } @@ -618,10 +614,8 @@ final class CustomDNSDataSource: UITableViewDiffableDataSource< if headerView.isExpanded { snapshot.deleteItems(Item.contentBlockers) - snapshot.deleteItems([.dnsServerInfo]) } else { snapshot.appendItems(Item.contentBlockers, toSection: .contentBlockers) - snapshot.appendItems([.dnsServerInfo]) } headerView.isExpanded.toggle()