summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2023-04-28 13:48:54 +0200
committerAndrej Mihajlov <and@mullvad.net>2023-04-28 13:48:54 +0200
commitbc1f1642ec674e62a4cf702811babcd78c118ca8 (patch)
treea16e3339c81583003e926fe3c0149d606cbdd384
parent95c3c5b19b2e44340c2ef78a2354c2c51629e21b (diff)
parent6255aa31c3dcdc9c8076c1a68e9ef348f3657af7 (diff)
downloadmullvadvpn-bc1f1642ec674e62a4cf702811babcd78c118ca8.tar.xz
mullvadvpn-bc1f1642ec674e62a4cf702811babcd78c118ca8.zip
Merge branch 'crash-in-vpn-settings-on-ipad-ios-145'
-rw-r--r--ios/MullvadVPN/View controllers/Preferences/PreferencesDataSource.swift15
1 files changed, 8 insertions, 7 deletions
diff --git a/ios/MullvadVPN/View controllers/Preferences/PreferencesDataSource.swift b/ios/MullvadVPN/View controllers/Preferences/PreferencesDataSource.swift
index c57eb887f9..1c56fad8a9 100644
--- a/ios/MullvadVPN/View controllers/Preferences/PreferencesDataSource.swift
+++ b/ios/MullvadVPN/View controllers/Preferences/PreferencesDataSource.swift
@@ -170,8 +170,9 @@ final class PreferencesDataSource: UITableViewDiffableDataSource<
viewModel = mergedViewModel
}
- updateSnapshot()
- reloadCustomDNSFooter()
+ updateSnapshot { [weak self] in
+ self?.reloadCustomDNSFooter()
+ }
}
// MARK: - UITableViewDataSource
@@ -558,11 +559,9 @@ final class PreferencesDataSource: UITableViewDiffableDataSource<
let sectionIndex = snapshot().indexOfSection(.customDNS)!
UIView.performWithoutAnimation {
- tableView?.performBatchUpdates({
- if let reusableView = tableView?.footerView(forSection: sectionIndex) as? SettingsStaticTextFooterView {
- configureFooterView(reusableView)
- }
- })
+ if let reusableView = tableView?.footerView(forSection: sectionIndex) as? SettingsStaticTextFooterView {
+ configureFooterView(reusableView)
+ }
}
}
@@ -601,6 +600,8 @@ final class PreferencesDataSource: UITableViewDiffableDataSource<
reusableView.titleLabel.attributedText = viewModel.customDNSPrecondition
.attributedLocalizedDescription(isEditing: isEditing, preferredFont: font)
+
+ reusableView.titleLabel.sizeToFit()
}
}