Fix filter apply button being enabled with zero providers

mullvad · Nov 11, 2024 · 8cb08ef · 8cb08ef
1 parent a8d5fc0
commit 8cb08ef
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/ios/MullvadVPN/View controllers/RelayFilter/RelayFilterDataSource.swift b/ios/MullvadVPN/View controllers/RelayFilter/RelayFilterDataSource.swift
@@ -285,10 +285,6 @@ extension RelayFilterDataSource: UITableViewDelegate {
         return nil
     }
 
-    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        return UITableView.automaticDimension
-    }
-
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
         return UIMetrics.TableView.separatorHeight
     }

diff --git a/ios/MullvadVPN/View controllers/RelayFilter/RelayFilterViewController.swift b/ios/MullvadVPN/View controllers/RelayFilter/RelayFilterViewController.swift
@@ -96,7 +96,18 @@ class RelayFilterViewController: UIViewController {
                 case .any:
                     self?.applyButton.isEnabled = true
                 case let .only(providers):
-                    self?.applyButton.isEnabled = !providers.isEmpty
+                    switch filter.ownership {
+                    case .any:
+                        self?.applyButton.isEnabled = !providers.isEmpty
+                    case .owned:
+                        let filterHasAtLeastOneOwnedProvider = viewModel.ownedProviders
+                            .first(where: { providers.contains($0) }) != nil
+                        self?.applyButton.isEnabled = filterHasAtLeastOneOwnedProvider
+                    case .rented:
+                        let filterHasAtLeastOneRentedProvider = viewModel.rentedProviders
+                            .first(where: { providers.contains($0) }) != nil
+                        self?.applyButton.isEnabled = filterHasAtLeastOneRentedProvider
+                    }
                 }
             }
             .store(in: &disposeBag)