Fix reloading of data in settings cells

Author: rablador

ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsDataSource.swift

@@ -264,14 +264,16 @@ final class VPNSettingsDataSource: UITableViewDiffableDataSource<
     }
 
     func update(from tunnelSettings: LatestTunnelSettings) {
-        let newViewModel = VPNSettingsViewModel(from: tunnelSettings)
-        let mergedViewModel = viewModel.merged(newViewModel)
+        updateViewModel(from: tunnelSettings)
+        updateSnapshot()
+    }
 
-        if viewModel != mergedViewModel {
-            viewModel = mergedViewModel
-        }
+    func reload(from tunnelSettings: LatestTunnelSettings) {
+        updateViewModel(from: tunnelSettings)
 
-        updateSnapshot()
+        var snapshot = snapshot()
+        snapshot.reconfigureItems(snapshot.itemIdentifiers)
+        applySnapshot(snapshot, animated: false)
     }
 
     // MARK: - UITableViewDelegate
@@ -416,6 +418,15 @@ final class VPNSettingsDataSource: UITableViewDiffableDataSource<
 
     // MARK: - Private
 
+    func updateViewModel(from tunnelSettings: LatestTunnelSettings) {
+        let newViewModel = VPNSettingsViewModel(from: tunnelSettings)
+        let mergedViewModel = viewModel.merged(newViewModel)
+
+        if viewModel != mergedViewModel {
+            viewModel = mergedViewModel
+        }
+    }
+
     private func registerClasses() {
         CellReuseIdentifiers.allCases.forEach { enumCase in
             tableView?.register(

ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsInteractor.swift

@@ -30,10 +30,12 @@ final class VPNSettingsInteractor {
         self.tunnelManager = tunnelManager
         self.relayCacheTracker = relayCacheTracker
 
-        tunnelObserver =
+        let tunnelObserver =
             TunnelBlockObserver(didUpdateTunnelSettings: { [weak self] _, newSettings in
                 self?.tunnelSettingsDidChange?(newSettings)
             })
+        self.tunnelObserver = tunnelObserver
+        tunnelManager.addObserver(tunnelObserver)
     }
 
     func updateSettings(_ changes: [TunnelSettingsUpdate], completion: (() -> Void)? = nil) {

ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsViewController.swift

@@ -57,7 +57,7 @@ class VPNSettingsViewController: UITableViewController {
         )
 
         interactor.tunnelSettingsDidChange = { [weak self] newSettings in
-            self?.dataSource?.update(from: newSettings)
+            self?.dataSource?.reload(from: newSettings)
         }
         dataSource?.update(from: interactor.tunnelSettings)